Delete 2.6.24 files for OLPC

[openwrt.git] / package / madwifi / patches / 371-wds_sta_separation.patch

diff --git a/package/madwifi/patches/371-wds_sta_separation.patch b/package/madwifi/patches/371-wds_sta_separation.patch
index aded93b..a37ebd4 100644 (file)
--- a/package/madwifi/patches/371-wds_sta_separation.patch
+++ b/package/madwifi/patches/371-wds_sta_separation.patch
@@ -17,14 +17,20 @@
                if (skb->len < hdrspace) {
                        IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
                                wh, "data", "too short: len %u, expecting %u",
-@@ -446,15 +447,20 @@
+@@ -445,16 +446,24 @@
+               }
                switch (vap->iv_opmode) {
                case IEEE80211_M_STA:
-                       if ((dir != IEEE80211_FC1_DIR_FROMDS) &&
+-                      if ((dir != IEEE80211_FC1_DIR_FROMDS) &&
 -                          (!((vap->iv_flags_ext & IEEE80211_FEXT_WDS) &&
 -                          (dir == IEEE80211_FC1_DIR_DSTODS)))) {
-+                          (!(vap->iv_flags_ext & IEEE80211_FEXT_WDS) &&
-+                           (dir == IEEE80211_FC1_DIR_DSTODS))) {
++                      switch(dir) {
++                      case IEEE80211_FC1_DIR_FROMDS:
++                              break;
++                      case IEEE80211_FC1_DIR_DSTODS:
++                              if (vap->iv_flags_ext & IEEE80211_FEXT_WDS)
++                                      break;
++                      default:
                                IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
                                        wh, "data", "invalid dir 0x%x", dir);
                                vap->iv_stats.is_rx_wrongdir++;
@@ -34,14 +40,13 @@
 -                      if (IEEE80211_IS_MULTICAST(wh->i_addr1)) {
 +                      if (IEEE80211_IS_MULTICAST(wh->i_addr1)) {
 +                              /* ignore 3-addr mcast if we're WDS STA */
-+                              if ((vap->iv_flags_ext & IEEE80211_FEXT_WDS) &&
-+                                      (dir != IEEE80211_FC1_DIR_DSTODS))
++                              if (vap->iv_flags_ext & IEEE80211_FEXT_WDS)
 +                                      goto out;
 +
                                /* Discard multicast if IFF_MULTICAST not set */
                                if ((0 != memcmp(wh->i_addr3, dev->broadcast, ETH_ALEN)) && 
                                        (0 == (dev->flags & IFF_MULTICAST))) {
-@@ -482,24 +488,6 @@
+@@ -482,24 +491,10 @@
                                        vap->iv_stats.is_rx_mcastecho++;
                                        goto out;
                                }
@@ -63,10 +68,14 @@
 -                                              goto out;
 -                                      }
 -                              }
++                      } else {
++                              /* Same BSSID, but not meant for us to receive */
++                              if (!IEEE80211_ADDR_EQ(wh->i_addr1, vap->iv_myaddr))
++                                      goto out;
                        }
                        break;
                case IEEE80211_M_IBSS:
-@@ -541,6 +529,11 @@
+@@ -541,6 +536,11 @@
                                vap->iv_stats.is_rx_notassoc++;
                                goto err;
                        }
@@ -78,7 +87,7 @@
                        /*
                         * If we're a 4 address packet, make sure we have an entry in
                         * the node table for the packet source address (addr4).
-@@ -548,9 +541,16 @@
+@@ -548,9 +548,16 @@
                         */
  
                        /* check for wds link first */
@@ -96,7 +105,7 @@
                                TAILQ_FOREACH(avp, &vap->iv_wdslinks, iv_wdsnext) {
                                        if (!memcmp(avp->wds_mac, wh->i_addr2, IEEE80211_ADDR_LEN)) {
                                                IEEE80211_LOCK_IRQ(ni->ni_ic);
-@@ -566,7 +566,7 @@
+@@ -566,7 +573,7 @@
                        }
  
                        /* XXX: Useless node mgmt API; make better */
@@ -105,7 +114,7 @@
                                struct ieee80211_node_table *nt = &ic->ic_sta;
                                struct ieee80211_frame_addr4 *wh4;
  
-@@ -626,6 +626,11 @@
+@@ -626,6 +633,11 @@
                        goto out;
                }
  
@@ -117,7 +126,7 @@
                /*
                 * Handle privacy requirements.  Note that we
                 * must not be preempted from here until after
-@@ -698,8 +703,12 @@
+@@ -698,8 +710,12 @@
                if (! accept_data_frame(vap, ni, key, skb, eh))
                        goto out;
  
@@ -132,7 +141,7 @@
                IEEE80211_NODE_STAT(ni, rx_data);
                IEEE80211_NODE_STAT_ADD(ni, rx_bytes, skb->len);
                ic->ic_lastdata = jiffies;
-@@ -1132,6 +1141,13 @@
+@@ -1132,6 +1148,13 @@
                dev = vap->iv_xrvap->iv_dev;
  #endif
  
@@ -146,7 +155,7 @@
        /* perform as a bridge within the vap */
        /* XXX intra-vap bridging only */
        if (vap->iv_opmode == IEEE80211_M_HOSTAP &&
-@@ -1157,7 +1173,15 @@
+@@ -1157,7 +1180,16 @@
                        if (ni1 != NULL) {
                                if (ni1->ni_vap == vap &&
                                    ieee80211_node_is_authorized(ni1) &&
@@ -155,6 +164,7 @@
 +
 +                                      /* tried to bridge to a subif, drop the packet */
 +                                      if (ni->ni_subif) {
++                                              ieee80211_unref_node(&ni1);
 +                                              ieee80211_dev_kfree_skb(&skb);
 +                                              return;
 +                                      }
@@ -476,25 +486,6 @@
  /* Locking */
  /* NB: beware, spin_is_locked() is not usefully defined for !(DEBUG || SMP)
   * because spinlocks do not exist in this configuration. Instead IRQs 
-@@ -167,6 +196,18 @@
-       IEEE80211_VAPS_LOCK_ASSERT(_ic);                \
-       spin_unlock_bh(&(_ic)->ic_vapslock);            \
- } while (0)
-+#define       IEEE80211_VAPS_LOCK_IRQ(_ic) do {                                       \
-+      unsigned long __vlockflags;                                     \
-+      IEEE80211_VAPS_LOCK_CHECK(_ic);                                 \
-+      spin_lock_irqsave(&(_ic)->ic_vapslock, __vlockflags);
-+#define       IEEE80211_VAPS_UNLOCK_IRQ(_ic)                                  \
-+      IEEE80211_VAPS_LOCK_ASSERT(_ic);                                        \
-+      spin_unlock_irqrestore(&(_ic)->ic_vapslock, __vlockflags);      \
-+} while (0)
-+#define       IEEE80211_VAPS_UNLOCK_IRQ_EARLY(_ic)                                    \
-+      IEEE80211_VAPS_LOCK_ASSERT(_ic);                                        \
-+      spin_unlock_irqrestore(&(_ic)->ic_vapslock, __vlockflags);
-+
- 
- #if (defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)) && defined(spin_is_locked)
- #define IEEE80211_VAPS_LOCK_ASSERT(_ic) \
 --- a/net80211/ieee80211_proto.c
 +++ b/net80211/ieee80211_proto.c
 @@ -1081,6 +1081,8 @@
@@ -540,18 +531,6 @@
        ieee80211_new_state(vap, IEEE80211_S_INIT, -1);
        if (dev->flags & IFF_RUNNING) {
                dev->flags &= ~IFF_RUNNING;             /* mark us stopped */
-@@ -1342,9 +1366,9 @@
-       struct ieee80211com *ic = vap->iv_ic;
-       int rc;
- 
--      IEEE80211_VAPS_LOCK_BH(ic);
-+      IEEE80211_VAPS_LOCK_IRQ(ic);
-       rc = vap->iv_newstate(vap, nstate, arg);
--      IEEE80211_VAPS_UNLOCK_BH(ic);
-+      IEEE80211_VAPS_UNLOCK_IRQ(ic);
-       return rc;
- }
- 
 @@ -1630,6 +1654,7 @@
                 */
                if (ni->ni_authmode != IEEE80211_AUTH_8021X)
@@ -780,7 +759,7 @@
                hdrsize = sizeof(struct ieee80211_frame);
  
        SKB_CB(skb)->auth_pkt = (eh.ether_type == __constant_htons(ETHERTYPE_PAE));
-+      if (!SKB_CB(skb)->auth_pkt && ni->ni_subif)
++      if (ni->ni_subif)
 +              vap = ni->ni_subif;
  
        switch (vap->iv_opmode) {