ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-31 16:35:44 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

improve wds sta mode compatibility

Browse Source 
SVN-Revision: 12449
This commit is contained in:
Felix Fietkau 2008-09-01 11:03:08 +00:00
parent 5f84265c34
commit 29edfd71dc
2 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
package/madwifi/patches/371-wds_sta_separation.patch
View File

@ -17,30 +17,24 @@
if (skb->len < hdrspace) { if (skb->len < hdrspace) {
IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
wh, "data", "too short: len %u, expecting %u", wh, "data", "too short: len %u, expecting %u",
@@ -445,16 +446,26 @@ @@ -445,16 +446,24 @@
} }
switch (vap->iv_opmode) { switch (vap->iv_opmode) {
case IEEE80211_M_STA: case IEEE80211_M_STA:
- if ((dir != IEEE80211_FC1_DIR_FROMDS) && - if ((dir != IEEE80211_FC1_DIR_FROMDS) &&
- (!((vap->iv_flags_ext & IEEE80211_FEXT_WDS) && - (!((vap->iv_flags_ext & IEEE80211_FEXT_WDS) &&
- (dir == IEEE80211_FC1_DIR_DSTODS)))) { - (dir == IEEE80211_FC1_DIR_DSTODS)))) {
- IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, + switch(dir) {
- wh, "data", "invalid dir 0x%x", dir); + case IEEE80211_FC1_DIR_FROMDS:
- vap->iv_stats.is_rx_wrongdir++; + break;
- goto out; + case IEEE80211_FC1_DIR_DSTODS:
+ {
+ int accept;
+
+ if (vap->iv_flags_ext & IEEE80211_FEXT_WDS) + if (vap->iv_flags_ext & IEEE80211_FEXT_WDS)
+ accept = IEEE80211_FC1_DIR_DSTODS; + break;
+ else + default:
+ accept = IEEE80211_FC1_DIR_FROMDS; IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
+ if (dir != accept) { wh, "data", "invalid dir 0x%x", dir);
+ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, vap->iv_stats.is_rx_wrongdir++;
+ wh, "data", "invalid dir 0x%x", dir); goto out;
+ vap->iv_stats.is_rx_wrongdir++;
+ goto out;
+ }
} }
- if (IEEE80211_IS_MULTICAST(wh->i_addr1)) { - if (IEEE80211_IS_MULTICAST(wh->i_addr1)) {
@ -52,7 +46,7 @@
/* Discard multicast if IFF_MULTICAST not set */ /* Discard multicast if IFF_MULTICAST not set */
if ((0 != memcmp(wh->i_addr3, dev->broadcast, ETH_ALEN)) && if ((0 != memcmp(wh->i_addr3, dev->broadcast, ETH_ALEN)) &&
(0 == (dev->flags & IFF_MULTICAST))) { (0 == (dev->flags & IFF_MULTICAST))) {
@@ -482,24 +493,10 @@ @@ -482,24 +491,10 @@
vap->iv_stats.is_rx_mcastecho++; vap->iv_stats.is_rx_mcastecho++;
goto out; goto out;
} }
@ -81,7 +75,7 @@
} }
break; break;
case IEEE80211_M_IBSS: case IEEE80211_M_IBSS:
@@ -541,6 +538,11 @@ @@ -541,6 +536,11 @@
vap->iv_stats.is_rx_notassoc++; vap->iv_stats.is_rx_notassoc++;
goto err; goto err;
} }
@ -93,7 +87,7 @@
/* /*
* If we're a 4 address packet, make sure we have an entry in * If we're a 4 address packet, make sure we have an entry in
* the node table for the packet source address (addr4). * the node table for the packet source address (addr4).
@@ -548,9 +550,16 @@ @@ -548,9 +548,16 @@
*/ */
/* check for wds link first */ /* check for wds link first */
@ -111,7 +105,7 @@
TAILQ_FOREACH(avp, &vap->iv_wdslinks, iv_wdsnext) { TAILQ_FOREACH(avp, &vap->iv_wdslinks, iv_wdsnext) {
if (!memcmp(avp->wds_mac, wh->i_addr2, IEEE80211_ADDR_LEN)) { if (!memcmp(avp->wds_mac, wh->i_addr2, IEEE80211_ADDR_LEN)) {
IEEE80211_LOCK_IRQ(ni->ni_ic); IEEE80211_LOCK_IRQ(ni->ni_ic);
@@ -566,7 +575,7 @@ @@ -566,7 +573,7 @@
} }
/* XXX: Useless node mgmt API; make better */ /* XXX: Useless node mgmt API; make better */
@ -120,7 +114,7 @@
struct ieee80211_node_table *nt = &ic->ic_sta; struct ieee80211_node_table *nt = &ic->ic_sta;
struct ieee80211_frame_addr4 *wh4; struct ieee80211_frame_addr4 *wh4;
@@ -626,6 +635,11 @@ @@ -626,6 +633,11 @@
goto out; goto out;
} }
@ -132,7 +126,7 @@
/* /*
* Handle privacy requirements. Note that we * Handle privacy requirements. Note that we
* must not be preempted from here until after * must not be preempted from here until after
@@ -698,8 +712,12 @@ @@ -698,8 +710,12 @@
if (! accept_data_frame(vap, ni, key, skb, eh)) if (! accept_data_frame(vap, ni, key, skb, eh))
goto out; goto out;
@ -147,7 +141,7 @@
IEEE80211_NODE_STAT(ni, rx_data); IEEE80211_NODE_STAT(ni, rx_data);
IEEE80211_NODE_STAT_ADD(ni, rx_bytes, skb->len); IEEE80211_NODE_STAT_ADD(ni, rx_bytes, skb->len);
ic->ic_lastdata = jiffies; ic->ic_lastdata = jiffies;
@@ -1132,6 +1150,13 @@ @@ -1132,6 +1148,13 @@
dev = vap->iv_xrvap->iv_dev; dev = vap->iv_xrvap->iv_dev;
#endif #endif
@ -161,7 +155,7 @@
/* perform as a bridge within the vap */ /* perform as a bridge within the vap */
/* XXX intra-vap bridging only */ /* XXX intra-vap bridging only */
if (vap->iv_opmode == IEEE80211_M_HOSTAP && if (vap->iv_opmode == IEEE80211_M_HOSTAP &&
@@ -1157,7 +1182,16 @@ @@ -1157,7 +1180,16 @@
if (ni1 != NULL) { if (ni1 != NULL) {
if (ni1->ni_vap == vap && if (ni1->ni_vap == vap &&
ieee80211_node_is_authorized(ni1) && ieee80211_node_is_authorized(ni1) &&

4
package/madwifi/patches/372-queue_vif.patch
View File

@ -1,6 +1,6 @@
--- a/net80211/ieee80211_input.c --- a/net80211/ieee80211_input.c
+++ b/net80211/ieee80211_input.c +++ b/net80211/ieee80211_input.c
@@ -1201,6 +1201,7 @@ @@ -1199,6 +1199,7 @@
} }
if (skb1 != NULL) { if (skb1 != NULL) {
struct ieee80211_node *ni_tmp; struct ieee80211_node *ni_tmp;
@ -8,7 +8,7 @@
skb1->dev = dev; skb1->dev = dev;
skb_reset_mac_header(skb1); skb_reset_mac_header(skb1);
skb_set_network_header(skb1, sizeof(struct ether_header)); skb_set_network_header(skb1, sizeof(struct ether_header));
@@ -1208,7 +1209,12 @@ @@ -1206,7 +1207,12 @@
skb1->protocol = __constant_htons(ETH_P_802_2); skb1->protocol = __constant_htons(ETH_P_802_2);
/* XXX insert vlan tag before queue it? */ /* XXX insert vlan tag before queue it? */
ni_tmp = SKB_CB(skb1)->ni; /* remember node so we can free it */ ni_tmp = SKB_CB(skb1)->ni; /* remember node so we can free it */