Felix Fietkau
17 years ago
parent
fd68041491
commit
7f052bf047
@ -1,61 +0,0 @@ |
|||||||
Index: madwifi-ng-r2834-20071106/ath/if_ath.c
|
|
||||||
===================================================================
|
|
||||||
--- madwifi-ng-r2834-20071106.orig/ath/if_ath.c 2007-11-07 14:02:00.957425434 +0100
|
|
||||||
+++ madwifi-ng-r2834-20071106/ath/if_ath.c 2007-11-07 14:02:01.785472625 +0100
|
|
||||||
@@ -5853,7 +5853,8 @@
|
|
||||||
* frame; it'll be dropped where it's not wanted.
|
|
||||||
*/
|
|
||||||
if (rs->rs_keyix != HAL_RXKEYIX_INVALID &&
|
|
||||||
- (ni = sc->sc_keyixmap[rs->rs_keyix]) != NULL) {
|
|
||||||
+ ((ni = sc->sc_keyixmap[rs->rs_keyix]) != NULL) &&
|
|
||||||
+ ieee80211_check_rxnode(ni, (const struct ieee80211_frame_min *) skb->data)) {
|
|
||||||
struct ath_node *an;
|
|
||||||
/*
|
|
||||||
* Fast path: node is present in the key map;
|
|
||||||
Index: madwifi-ng-r2834-20071106/net80211/ieee80211_node.c
|
|
||||||
===================================================================
|
|
||||||
--- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_node.c 2007-11-07 14:01:59.581347018 +0100
|
|
||||||
+++ madwifi-ng-r2834-20071106/net80211/ieee80211_node.c 2007-11-07 14:02:01.789472851 +0100
|
|
||||||
@@ -1290,8 +1290,6 @@
|
|
||||||
IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt);
|
|
||||||
|
|
||||||
return ni;
|
|
||||||
-#undef IS_PSPOLL
|
|
||||||
-#undef IS_CTL
|
|
||||||
}
|
|
||||||
#ifdef IEEE80211_DEBUG_REFCNT
|
|
||||||
EXPORT_SYMBOL(ieee80211_find_rxnode_debug);
|
|
||||||
@@ -1299,6 +1297,20 @@
|
|
||||||
EXPORT_SYMBOL(ieee80211_find_rxnode);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+int
|
|
||||||
+ieee80211_check_rxnode(struct ieee80211_node *ni,
|
|
||||||
+ const struct ieee80211_frame_min *wh)
|
|
||||||
+{
|
|
||||||
+ if (IS_CTL(wh) && !IS_PSPOLL(wh) /*&& !IS_RTS(ah)*/)
|
|
||||||
+ return IEEE80211_ADDR_EQ(ni->ni_macaddr, wh->i_addr1);
|
|
||||||
+ else
|
|
||||||
+ return IEEE80211_ADDR_EQ(ni->ni_macaddr, wh->i_addr2);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+EXPORT_SYMBOL(ieee80211_check_rxnode);
|
|
||||||
+#undef IS_PSPOLL
|
|
||||||
+#undef IS_CTL
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
* Return a reference to the appropriate node for sending
|
|
||||||
* a data frame. This handles node discovery in adhoc networks.
|
|
||||||
Index: madwifi-ng-r2834-20071106/net80211/ieee80211_node.h
|
|
||||||
===================================================================
|
|
||||||
--- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_node.h 2007-11-07 14:01:59.589347473 +0100
|
|
||||||
+++ madwifi-ng-r2834-20071106/net80211/ieee80211_node.h 2007-11-07 14:02:01.873477636 +0100
|
|
||||||
@@ -328,6 +328,8 @@
|
|
||||||
*pni = NULL; /* guard against use */
|
|
||||||
}
|
|
||||||
|
|
||||||
+int ieee80211_check_rxnode(struct ieee80211_node *ni,
|
|
||||||
+ const struct ieee80211_frame_min *wh);
|
|
||||||
int ieee80211_add_wds_addr(struct ieee80211_node_table *, struct ieee80211_node *,
|
|
||||||
const u_int8_t *, u_int8_t);
|
|
||||||
void ieee80211_remove_wds_addr(struct ieee80211_node_table *, const u_int8_t *);
|
|
||||||
@ -1,13 +0,0 @@ |
|||||||
Index: madwifi-ng-r2834-20071106/ath/if_ath.c
|
|
||||||
===================================================================
|
|
||||||
--- madwifi-ng-r2834-20071106.orig/ath/if_ath.c 2007-11-07 14:02:03.853590479 +0100
|
|
||||||
+++ madwifi-ng-r2834-20071106/ath/if_ath.c 2007-11-07 14:02:04.077603246 +0100
|
|
||||||
@@ -4162,6 +4162,8 @@
|
|
||||||
}
|
|
||||||
bf = avp->av_bcbuf;
|
|
||||||
ni = bf->bf_node;
|
|
||||||
+ if (!ni)
|
|
||||||
+ return NULL;
|
|
||||||
|
|
||||||
#ifdef ATH_SUPERG_DYNTURBO
|
|
||||||
/*
|
|
||||||
@ -1,59 +0,0 @@ |
|||||||
Index: madwifi-ng-r2834-20071106/ath_hal/ah_os.h
|
|
||||||
===================================================================
|
|
||||||
--- madwifi-ng-r2834-20071106.orig/ath_hal/ah_os.h 2007-11-07 14:01:59.257328552 +0100
|
|
||||||
+++ madwifi-ng-r2834-20071106/ath_hal/ah_os.h 2007-11-07 14:02:04.329617605 +0100
|
|
||||||
@@ -172,44 +172,25 @@
|
|
||||||
* never byte-swapped by PCI chipsets or bridges, but always
|
|
||||||
* written directly (i.e. the format defined by the manufacturer).
|
|
||||||
*/
|
|
||||||
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
|
|
||||||
-# if (AH_BYTE_ORDER == AH_BIG_ENDIAN)
|
|
||||||
+#if (AH_BYTE_ORDER == AH_BIG_ENDIAN)
|
|
||||||
#define _OS_REG_WRITE(_ah, _reg, _val) do { \
|
|
||||||
(0x4000 <= (_reg) && (_reg) < 0x5000) ? \
|
|
||||||
- iowrite32((_val), (_ah)->ah_sh + (_reg)) : \
|
|
||||||
- iowrite32be((_val), (_ah)->ah_sh + (_reg)); \
|
|
||||||
- } while (0)
|
|
||||||
-#define _OS_REG_READ(_ah, _reg) \
|
|
||||||
- ((0x4000 <= (_reg) && (_reg) < 0x5000) ? \
|
|
||||||
- ioread32((_ah)->ah_sh + (_reg)) : \
|
|
||||||
- ioread32be((_ah)->ah_sh + (_reg)));
|
|
||||||
-# else /* AH_LITTLE_ENDIAN */
|
|
||||||
-#define _OS_REG_WRITE(_ah, _reg, _val) do { \
|
|
||||||
- iowrite32(_val, (_ah)->ah_sh + (_reg)); \
|
|
||||||
- } while (0)
|
|
||||||
-#define _OS_REG_READ(_ah, _reg) \
|
|
||||||
- ioread32((_ah)->ah_sh + (_reg))
|
|
||||||
-
|
|
||||||
-# endif /* AH_BYTE_ORDER */
|
|
||||||
-#else
|
|
||||||
-# if (AH_BYTE_ORDER == AH_BIG_ENDIAN)
|
|
||||||
-#define _OS_REG_WRITE(_ah, _reg, _val) do { \
|
|
||||||
- writel((0x4000 <= (_reg) && (_reg) < 0x5000) ? \
|
|
||||||
- (_val) : cpu_to_le32(_val), \
|
|
||||||
- (_ah)->ah_sh + (_reg)); \
|
|
||||||
- } while (0)
|
|
||||||
+ writel((_val), (_ah)->ah_sh + (_reg)) : \
|
|
||||||
+ ({__raw_writel((_val), (_ah)->ah_sh + (_reg)); \
|
|
||||||
+ mb(); }); \
|
|
||||||
+} while (0)
|
|
||||||
#define _OS_REG_READ(_ah, _reg) \
|
|
||||||
((0x4000 <= (_reg) && (_reg) < 0x5000) ? \
|
|
||||||
readl((_ah)->ah_sh + (_reg)) : \
|
|
||||||
- cpu_to_le32(readl((_ah)->ah_sh + (_reg))))
|
|
||||||
-# else /* AH_LITTLE_ENDIAN */
|
|
||||||
+ ({unsigned long __v = __raw_readl((_ah)->ah_sh + \
|
|
||||||
+ (_reg)); mb(); __v; }))
|
|
||||||
+#else /* AH_LITTLE_ENDIAN */
|
|
||||||
#define _OS_REG_WRITE(_ah, _reg, _val) do { \
|
|
||||||
writel(_val, (_ah)->ah_sh + (_reg)); \
|
|
||||||
- } while (0)
|
|
||||||
+} while (0)
|
|
||||||
#define _OS_REG_READ(_ah, _reg) \
|
|
||||||
readl((_ah)->ah_sh + (_reg))
|
|
||||||
-# endif /* AH_BYTE_ORDER */
|
|
||||||
-#endif /* KERNEL_VERSON(2,6,12) */
|
|
||||||
+#endif /* AH_BYTE_ORDER */
|
|
||||||
|
|
||||||
/*
|
|
||||||
The functions in this section are not intended to be invoked by MadWifi driver
|
|
||||||
Loading…
Reference in new issue