RepoMirrors/openwrt
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2024-12-24 15:43:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

madwifi: fix rx for pure wds interfaces

Browse Source 
SVN-Revision: 14203
This commit is contained in:
Felix Fietkau 2009-01-26 14:37:21 +00:00
parent 172dbe47b6
commit a43685367e
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/madwifi/patches/392-remove_wds_nodetracking.patch
View File

@ -58,7 +58,7 @@
} }
static __inline static __inline
@@ -1201,142 +1196,6 @@ void ieee80211_wds_addif(struct ieee8021 @@ -1204,142 +1199,6 @@ void ieee80211_wds_addif(struct ieee8021
schedule_work(&ni->ni_create); schedule_work(&ni->ni_create);
} }
@ -201,7 +201,7 @@
/* Add the specified station to the station table. /* Add the specified station to the station table.
* Allocates a new ieee80211_node* that has a reference count of one * Allocates a new ieee80211_node* that has a reference count of one
* If tmp is 0, it is added to the node table and the reference is used. * If tmp is 0, it is added to the node table and the reference is used.
@@ -1382,34 +1241,6 @@ ieee80211_dup_bss(struct ieee80211vap *v @@ -1385,34 +1244,6 @@ ieee80211_dup_bss(struct ieee80211vap *v
return ni; return ni;
} }
@ -236,7 +236,7 @@
/* NB: A node reference is acquired here; the caller MUST release it. */ /* NB: A node reference is acquired here; the caller MUST release it. */
#ifdef IEEE80211_DEBUG_REFCNT #ifdef IEEE80211_DEBUG_REFCNT
#define ieee80211_find_node_locked(nt, mac) \ #define ieee80211_find_node_locked(nt, mac) \
@@ -1427,7 +1258,6 @@ ieee80211_find_node_locked(struct ieee80 @@ -1430,7 +1261,6 @@ ieee80211_find_node_locked(struct ieee80
{ {
struct ieee80211_node *ni; struct ieee80211_node *ni;
int hash; int hash;
@ -244,7 +244,7 @@
IEEE80211_NODE_TABLE_LOCK_ASSERT(nt); IEEE80211_NODE_TABLE_LOCK_ASSERT(nt);
@@ -1442,48 +1272,11 @@ ieee80211_find_node_locked(struct ieee80 @@ -1445,48 +1275,11 @@ ieee80211_find_node_locked(struct ieee80
return ni; return ni;
} }
} }
@ -293,7 +293,7 @@
ieee80211_find_node_debug(struct ieee80211_node_table *nt, ieee80211_find_node_debug(struct ieee80211_node_table *nt,
const u_int8_t *macaddr, const char *func, int line) const u_int8_t *macaddr, const char *func, int line)
#else #else
@@ -1835,7 +1628,6 @@ ieee80211_node_table_cleanup(struct ieee @@ -1838,7 +1631,6 @@ ieee80211_node_table_cleanup(struct ieee
ic->ic_node_cleanup(ni); ic->ic_node_cleanup(ni);
#endif #endif
} }
@ -301,7 +301,7 @@
IEEE80211_SCAN_LOCK_DESTROY(nt); IEEE80211_SCAN_LOCK_DESTROY(nt);
IEEE80211_NODE_TABLE_LOCK_DESTROY(nt); IEEE80211_NODE_TABLE_LOCK_DESTROY(nt);
} }
@@ -2402,8 +2194,6 @@ ieee80211_node_leave(struct ieee80211_no @@ -2404,8 +2196,6 @@ ieee80211_node_leave(struct ieee80211_no
* so no more references are generated * so no more references are generated
*/ */
if (nt) { if (nt) {

15
package/madwifi/patches/393-mbss_vap_auth.patch
View File

@ -19,7 +19,7 @@
if (ni == NULL) { if (ni == NULL) {
ni = ieee80211_alloc_node_table(vap, se->se_macaddr); ni = ieee80211_alloc_node_table(vap, se->se_macaddr);
IEEE80211_DPRINTF(vap, IEEE80211_MSG_ASSOC, IEEE80211_DPRINTF(vap, IEEE80211_MSG_ASSOC,
@@ -1391,6 +1394,53 @@ ieee80211_add_neighbor(struct ieee80211v @@ -1394,6 +1397,53 @@ ieee80211_add_neighbor(struct ieee80211v
return ni; return ni;
} }
@ -73,7 +73,7 @@
/* /*
* Return the node for the sender of a frame; if the sender is unknown return * Return the node for the sender of a frame; if the sender is unknown return
* NULL. The caller is expected to deal with this. (The frame is sent to all * NULL. The caller is expected to deal with this. (The frame is sent to all
@@ -1400,10 +1450,10 @@ ieee80211_add_neighbor(struct ieee80211v @@ -1403,10 +1453,10 @@ ieee80211_add_neighbor(struct ieee80211v
*/ */
struct ieee80211_node * struct ieee80211_node *
#ifdef IEEE80211_DEBUG_REFCNT #ifdef IEEE80211_DEBUG_REFCNT
@ -86,7 +86,7 @@
const struct ieee80211_frame_min *wh) const struct ieee80211_frame_min *wh)
#endif #endif
{ {
@@ -1411,9 +1461,8 @@ ieee80211_find_rxnode(struct ieee80211co @@ -1414,9 +1464,8 @@ ieee80211_find_rxnode(struct ieee80211co
((wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_CTL) ((wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_CTL)
#define IS_PSPOLL(wh) \ #define IS_PSPOLL(wh) \
((wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) == IEEE80211_FC0_SUBTYPE_PS_POLL) ((wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) == IEEE80211_FC0_SUBTYPE_PS_POLL)
@ -98,7 +98,7 @@
const u_int8_t *addr; const u_int8_t *addr;
if (IS_CTL(wh) && !IS_PSPOLL(wh) /*&& !IS_RTS(ah)*/) if (IS_CTL(wh) && !IS_PSPOLL(wh) /*&& !IS_RTS(ah)*/)
@@ -1426,32 +1475,24 @@ ieee80211_find_rxnode(struct ieee80211co @@ -1429,32 +1478,25 @@ ieee80211_find_rxnode(struct ieee80211co
/* XXX check ic_bss first in station mode */ /* XXX check ic_bss first in station mode */
/* XXX 4-address frames? */ /* XXX 4-address frames? */
@ -118,6 +118,7 @@
- else - else
- return NULL; - return NULL;
+ ni = ieee80211_ref_node(avp->iv_wdsnode); + ni = ieee80211_ref_node(avp->iv_wdsnode);
+ return ni;
} }
+ if (!(vap->iv_flags_ext & IEEE80211_FEXT_WDS)) + if (!(vap->iv_flags_ext & IEEE80211_FEXT_WDS))
+ return NULL; + return NULL;
@ -140,7 +141,7 @@
} }
#ifdef IEEE80211_DEBUG_REFCNT #ifdef IEEE80211_DEBUG_REFCNT
EXPORT_SYMBOL(ieee80211_find_rxnode_debug); EXPORT_SYMBOL(ieee80211_find_rxnode_debug);
@@ -1476,15 +1517,14 @@ ieee80211_find_txnode(struct ieee80211va @@ -1479,15 +1521,14 @@ ieee80211_find_txnode(struct ieee80211va
struct ieee80211com *ic = vap->iv_ic; struct ieee80211com *ic = vap->iv_ic;
struct ieee80211_node_table *nt; struct ieee80211_node_table *nt;
struct ieee80211_node *ni = NULL; struct ieee80211_node *ni = NULL;
@ -157,7 +158,7 @@
/* /*
* The destination address should be in the node table * The destination address should be in the node table
@@ -1502,11 +1542,22 @@ ieee80211_find_txnode(struct ieee80211va @@ -1505,11 +1546,22 @@ ieee80211_find_txnode(struct ieee80211va
/* XXX: Can't hold lock across dup_bss due to recursive locking. */ /* XXX: Can't hold lock across dup_bss due to recursive locking. */
nt = &vap->iv_ic->ic_sta; nt = &vap->iv_ic->ic_sta;
IEEE80211_NODE_TABLE_LOCK_IRQ(nt); IEEE80211_NODE_TABLE_LOCK_IRQ(nt);
@ -182,7 +183,7 @@
IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt); IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt);
if (ni == NULL) { if (ni == NULL) {
@@ -1961,13 +2012,32 @@ remove_worse_nodes(void *arg, struct iee @@ -1964,13 +2016,32 @@ remove_worse_nodes(void *arg, struct iee
} }
} }