brcm47xx: update bcma and ssb to master-2011-07-21

[openwrt.git] / package / madwifi / patches / 305-pureg_fix.patch

diff --git a/package/madwifi/patches/305-pureg_fix.patch b/package/madwifi/patches/305-pureg_fix.patch
index d3c49d1..8adb8a7 100644 (file)
--- a/package/madwifi/patches/305-pureg_fix.patch
+++ b/package/madwifi/patches/305-pureg_fix.patch
@@ -1,8 +1,6 @@
-Index: madwifi-ng-r2420-20070602/ath/if_ath.c
-===================================================================
---- madwifi-ng-r2420-20070602.orig/ath/if_ath.c        2007-06-04 13:21:58.684055336 +0200
-+++ madwifi-ng-r2420-20070602/ath/if_ath.c     2007-06-04 13:21:58.895023264 +0200
-@@ -3362,7 +3362,9 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -4158,7 +4158,9 @@ ath_calcrxfilter(struct ath_softc *sc)

                rfilt |= HAL_RX_FILTER_PROM;
        if (ic->ic_opmode == IEEE80211_M_STA ||
            sc->sc_opmode == HAL_M_IBSS ||      /* NB: AHDEMO too */
                rfilt |= HAL_RX_FILTER_PROM;
        if (ic->ic_opmode == IEEE80211_M_STA ||
            sc->sc_opmode == HAL_M_IBSS ||      /* NB: AHDEMO too */


@@ -11,47 +9,56 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
 +              ((ic->ic_opmode == IEEE80211_M_HOSTAP) &&
 +               (ic->ic_protmode != IEEE80211_PROT_NONE)))
                rfilt |= HAL_RX_FILTER_BEACON;
 +              ((ic->ic_opmode == IEEE80211_M_HOSTAP) &&
 +               (ic->ic_protmode != IEEE80211_PROT_NONE)))
                rfilt |= HAL_RX_FILTER_BEACON;

-       if ((sc->sc_nmonvaps > 0) || ((sc->sc_nvaps > 0) && (sc->sc_nibssvaps > 0)))
+       if (sc->sc_nmonvaps > 0)

                rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |
                rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |

-Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c
-===================================================================
---- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_input.c  2007-06-04 13:21:58.461089232 +0200
-+++ madwifi-ng-r2420-20070602/net80211/ieee80211_input.c       2007-06-04 13:21:58.897022960 +0200
-@@ -321,11 +321,12 @@
+--- a/net80211/ieee80211_input.c
++++ b/net80211/ieee80211_input.c
+@@ -346,11 +346,12 @@ ieee80211_input(struct ieee80211vap * va

                                bssid = wh->i_addr3;
                        }
                        /*
 -                       * Validate the bssid.
 +                       * Validate the bssid. Let beacons get through though for 11g protection mode.
                         */
                                bssid = wh->i_addr3;
                        }
                        /*
 -                       * Validate the bssid.
 +                       * Validate the bssid. Let beacons get through though for 11g protection mode.
                         */

- #ifdef ATH_SUPERG_XR
-                       if (!IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) &&
+-#ifdef ATH_SUPERG_XR
+                       if (!IEEE80211_ADDR_EQ(bssid, vap->iv_bssid) &&

 -                          !IEEE80211_ADDR_EQ(bssid, dev->broadcast)) {
 +                          !IEEE80211_ADDR_EQ(bssid, dev->broadcast) &&
 +                              (subtype != IEEE80211_FC0_SUBTYPE_BEACON)) {
 -                          !IEEE80211_ADDR_EQ(bssid, dev->broadcast)) {
 +                          !IEEE80211_ADDR_EQ(bssid, dev->broadcast) &&
 +                              (subtype != IEEE80211_FC0_SUBTYPE_BEACON)) {

++#ifdef ATH_SUPERG_XR

                                /*
                                 * allow MGT frames to vap->iv_xrvap.
                                 * this will allow roaming between  XR and normal vaps
                                /*
                                 * allow MGT frames to vap->iv_xrvap.
                                 * this will allow roaming between  XR and normal vaps

-@@ -344,7 +345,8 @@
-                       }
+@@ -366,18 +367,14 @@ ieee80211_input(struct ieee80211vap * va
+                                       vap->iv_stats.is_rx_wrongbss++;
+                                       goto out;
+                               }
+-                      }

  #else
  #else

-                       if (!IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) &&
+-                      if (!IEEE80211_ADDR_EQ(bssid, vap->iv_bssid) &&

 -                          !IEEE80211_ADDR_EQ(bssid, dev->broadcast)) {
 -                          !IEEE80211_ADDR_EQ(bssid, dev->broadcast)) {

-+                          !IEEE80211_ADDR_EQ(bssid, dev->broadcast) &&
-+                              (subtype != IEEE80211_FC0_SUBTYPE_BEACON)) {

                                /* not interested in */
                                IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
                                        bssid, NULL, "%s", "not to bss");
                                /* not interested in */
                                IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
                                        bssid, NULL, "%s", "not to bss");

-@@ -2542,7 +2544,7 @@
+                               vap->iv_stats.is_rx_wrongbss++;
+                               goto out;
+-                      }
+-
+ #endif
++                      }
+                       break;
+               case IEEE80211_M_WDS:
+                       if (skb->len < sizeof(struct ieee80211_frame_addr4)) {
+@@ -3066,7 +3063,7 @@ ieee80211_recv_mgmt(struct ieee80211vap

        u_int8_t *frm, *efrm;
        u_int8_t *frm, *efrm;

-       u_int8_t *ssid, *rates, *xrates, *wpa, *rsn, *wme, *ath;
+       u_int8_t *ssid, *rates, *xrates, *suppchan, *wpa, *rsn, *wme, *ath;

        u_int8_t rate;
 -      int reassoc, resp, allocbs = 0;
 +      int reassoc, resp, allocbs = 0, has_erp = 0;
        u_int8_t qosinfo;
  
        u_int8_t rate;
 -      int reassoc, resp, allocbs = 0;
 +      int reassoc, resp, allocbs = 0, has_erp = 0;
        u_int8_t qosinfo;
  

-       wh = (struct ieee80211_frame *) skb->data;
-@@ -2564,11 +2566,15 @@
+       if (ni_or_null == NULL)
+@@ -3096,11 +3093,15 @@ ieee80211_recv_mgmt(struct ieee80211vap

                 *    o station mode when associated (to collect state
                 *      updates such as 802.11g slot time), or
                 *    o adhoc mode (to discover neighbors)
                 *    o station mode when associated (to collect state
                 *      updates such as 802.11g slot time), or
                 *    o adhoc mode (to discover neighbors)


@@ -68,7 +75,7 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c
                        vap->iv_stats.is_rx_mgtdiscard++;
                        return;
                }
                        vap->iv_stats.is_rx_mgtdiscard++;
                        return;
                }

-@@ -2651,6 +2657,7 @@
+@@ -3184,6 +3185,7 @@ ieee80211_recv_mgmt(struct ieee80211vap

                                        break;
                                }
                                scan.erp = frm[2];
                                        break;
                                }
                                scan.erp = frm[2];


@@ -76,7 +83,7 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c
                                break;
                        case IEEE80211_ELEMID_RSN:
                                scan.rsn = frm;
                                break;
                        case IEEE80211_ELEMID_RSN:
                                scan.rsn = frm;

-@@ -2826,6 +2833,20 @@
+@@ -3421,6 +3423,20 @@ ieee80211_recv_mgmt(struct ieee80211vap

                                ieee80211_bg_scan(vap);
                        return;
                }
                                ieee80211_bg_scan(vap);
                        return;
                }


@@ -84,11 +91,11 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c
 +              /* Update AP protection mode when in 11G mode */
 +              if ((vap->iv_opmode == IEEE80211_M_HOSTAP) &&
 +                      IEEE80211_IS_CHAN_ANYG(ic->ic_curchan)) {
 +              /* Update AP protection mode when in 11G mode */
 +              if ((vap->iv_opmode == IEEE80211_M_HOSTAP) &&
 +                      IEEE80211_IS_CHAN_ANYG(ic->ic_curchan)) {

-+                              
++

 +                      /* Assume no ERP IE == 11b AP */
 +                      if ((!has_erp || (has_erp && (scan.erp & IEEE80211_ERP_NON_ERP_PRESENT))) &&
 +                              !(ic->ic_flags & IEEE80211_F_USEPROT)) {
 +                      /* Assume no ERP IE == 11b AP */
 +                      if ((!has_erp || (has_erp && (scan.erp & IEEE80211_ERP_NON_ERP_PRESENT))) &&
 +                              !(ic->ic_flags & IEEE80211_F_USEPROT)) {

-+                              
++

 +                              ic->ic_flags |= IEEE80211_F_USEPROT;
 +                              ic->ic_flags_ext |= IEEE80211_FEXT_ERPUPDATE;
 +                      }
 +                              ic->ic_flags |= IEEE80211_F_USEPROT;
 +                              ic->ic_flags_ext |= IEEE80211_FEXT_ERPUPDATE;
 +                      }


@@ -97,11 +104,9 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c
                /*
                 * If scanning, just pass information to the scan module.
                 */
                /*
                 * If scanning, just pass information to the scan module.
                 */

-Index: madwifi-ng-r2420-20070602/net80211/ieee80211_node.c
-===================================================================
---- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_node.c   2007-06-04 13:21:57.503234848 +0200
-+++ madwifi-ng-r2420-20070602/net80211/ieee80211_node.c        2007-06-04 13:21:58.897022960 +0200
-@@ -332,10 +332,16 @@
+--- a/net80211/ieee80211_node.c
++++ b/net80211/ieee80211_node.c
+@@ -383,10 +383,16 @@ ieee80211_create_ibss(struct ieee80211va

        /* Update country ie information */
        ieee80211_build_countryie(ic);
  
        /* Update country ie information */
        ieee80211_build_countryie(ic);
  


@@ -115,16 +120,14 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_node.c
 +
 +      if ((vap->iv_flags & IEEE80211_F_PUREG) &&
 +              IEEE80211_IS_CHAN_ANYG(chan)) {
 +
 +      if ((vap->iv_flags & IEEE80211_F_PUREG) &&
 +              IEEE80211_IS_CHAN_ANYG(chan)) {

-+              ieee80211_setpuregbasicrates(&ni->ni_rates); 
++              ieee80211_setpuregbasicrates(&ni->ni_rates);

 +      }
  
        (void) ieee80211_sta_join1(PASS_NODE(ni));
  }
 +      }
  
        (void) ieee80211_sta_join1(PASS_NODE(ni));
  }

-Index: madwifi-ng-r2420-20070602/net80211/ieee80211_proto.c
-===================================================================
---- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_proto.c  2007-06-04 13:21:58.133139088 +0200
-+++ madwifi-ng-r2420-20070602/net80211/ieee80211_proto.c       2007-06-04 13:21:58.898022808 +0200
-@@ -586,6 +586,28 @@
+--- a/net80211/ieee80211_proto.c
++++ b/net80211/ieee80211_proto.c
+@@ -595,6 +595,28 @@ static const struct ieee80211_rateset ba

        { 4, { 2, 4, 11, 22 } },        /* IEEE80211_MODE_TURBO_G (mixed b/g) */
  };
  
        { 4, { 2, 4, 11, 22 } },        /* IEEE80211_MODE_TURBO_G (mixed b/g) */
  };
  


@@ -153,16 +156,13 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_proto.c
  /*
   * Mark the basic rates for the 11g rate table based on the
   * specified mode.  For 11b compatibility we mark only 11b
  /*
   * Mark the basic rates for the 11g rate table based on the
   * specified mode.  For 11b compatibility we mark only 11b

-Index: madwifi-ng-r2420-20070602/net80211/ieee80211_var.h
-===================================================================
---- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_var.h    2007-06-04 13:21:58.134138936 +0200
-+++ madwifi-ng-r2420-20070602/net80211/ieee80211_var.h 2007-06-04 13:21:58.899022656 +0200
-@@ -593,6 +593,8 @@
- void ieee80211_build_countryie(struct ieee80211com *);
- int ieee80211_media_setup(struct ieee80211com *, struct ifmedia *, u_int32_t,
-       ifm_change_cb_t, ifm_stat_cb_t);
+--- a/net80211/ieee80211_var.h
++++ b/net80211/ieee80211_var.h
+@@ -708,6 +708,7 @@ int ieee80211_media_setup(struct ieee802
+ void ieee80211_build_sc_ie(struct ieee80211com *);
+ void ieee80211_dfs_action(struct ieee80211com *);
+ void ieee80211_expire_channel_excl_restrictions(struct ieee80211com *);

 +void ieee80211_setpuregbasicrates(struct ieee80211_rateset *rs);
 +void ieee80211_setpuregbasicrates(struct ieee80211_rateset *rs);

-+              

  
  

- /* Key update synchronization methods.  XXX should not be visible. */
- static __inline void
+ /*
+  * Iterate through ic_channels to enumerate all distinct ic_ieee channel numbers.