mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-01 20:50:20 +02:00
1f9285016a
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7864 3c298f89-4303-0410-b956-a3cf2f4a3e73
62 lines
2.4 KiB
Diff
62 lines
2.4 KiB
Diff
Index: madwifi-ng-r2525-20070630/ath/if_ath.c
|
|
===================================================================
|
|
--- madwifi-ng-r2525-20070630.orig/ath/if_ath.c 2007-07-03 23:02:28.585830250 +0200
|
|
+++ madwifi-ng-r2525-20070630/ath/if_ath.c 2007-07-03 23:02:29.069860500 +0200
|
|
@@ -5726,7 +5726,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-r2525-20070630/net80211/ieee80211_node.c
|
|
===================================================================
|
|
--- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_node.c 2007-07-03 23:02:25.905662750 +0200
|
|
+++ madwifi-ng-r2525-20070630/net80211/ieee80211_node.c 2007-07-03 23:02:29.073860750 +0200
|
|
@@ -1271,8 +1271,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);
|
|
@@ -1280,6 +1278,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-r2525-20070630/net80211/ieee80211_node.h
|
|
===================================================================
|
|
--- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_node.h 2007-07-03 23:02:25.917663500 +0200
|
|
+++ madwifi-ng-r2525-20070630/net80211/ieee80211_node.h 2007-07-03 23:02:29.121863750 +0200
|
|
@@ -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 *);
|