projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
madwifi: fix 'bad ratekbps' message when running adhoc in .11a
[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 cbe98e0..a995397 100644 (file)
--- a/package/madwifi/patches/305-pureg_fix.patch
+++ b/package/madwifi/patches/305-pureg_fix.patch
@@ -1,7 +1,8 @@
-diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.dev/ath/if_ath.c
---- madwifi-ng-r2377-20070526.old/ath/if_ath.c 2007-05-26 18:51:09.426654472 +0200
-+++ madwifi-ng-r2377-20070526.dev/ath/if_ath.c 2007-05-26 18:51:09.440652344 +0200
-@@ -3383,7 +3383,9 @@
+Index: madwifi-ng-r2568-20070710/ath/if_ath.c
+===================================================================
+--- madwifi-ng-r2568-20070710.orig/ath/if_ath.c        2007-07-23 01:48:45.406567742 +0200
++++ madwifi-ng-r2568-20070710/ath/if_ath.c     2007-07-23 01:48:45.690583928 +0200
+@@ -3384,7 +3384,9 @@
                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 */
@@ -10,12 +11,13 @@ diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.d
 +              ((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) 
-               rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON | 
-diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_input.c
---- madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c   2007-05-26 18:51:09.429654016 +0200
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_input.c   2007-05-26 18:51:09.443651888 +0200
-@@ -343,11 +343,12 @@
+       if ((sc->sc_nmonvaps > 0) || ((sc->sc_nvaps > 0) && (sc->sc_nibssvaps > 0)))
+               rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |
+Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c
+===================================================================
+--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_input.c  2007-07-23 01:48:45.030546315 +0200
++++ madwifi-ng-r2568-20070710/net80211/ieee80211_input.c       2007-07-23 01:48:45.690583928 +0200
+@@ -321,11 +321,12 @@
                                bssid = wh->i_addr3;
                        }
                        /*
                                bssid = wh->i_addr3;
                        }
                        /*
@@ -30,7 +32,7 @@ diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c madwifi-ng-r2
                                /*
                                 * 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
-@@ -366,7 +367,8 @@
+@@ -344,7 +345,8 @@
                        }
  #else
                        if (!IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) &&
                        }
  #else
                        if (!IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) &&
@@ -40,7 +42,7 @@ diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c madwifi-ng-r2
                                /* 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");
-@@ -2593,7 +2595,7 @@
+@@ -2541,7 +2543,7 @@
        u_int8_t *frm, *efrm;
        u_int8_t *ssid, *rates, *xrates, *wpa, *rsn, *wme, *ath;
        u_int8_t rate;
        u_int8_t *frm, *efrm;
        u_int8_t *ssid, *rates, *xrates, *wpa, *rsn, *wme, *ath;
        u_int8_t rate;
@@ -49,13 +51,13 @@ diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c madwifi-ng-r2
        u_int8_t qosinfo;
  
        wh = (struct ieee80211_frame *) skb->data;
        u_int8_t qosinfo;
  
        wh = (struct ieee80211_frame *) skb->data;
-@@ -2615,11 +2617,15 @@
+@@ -2563,11 +2565,15 @@
                 *    o station mode when associated (to collect state
                 *      updates such as 802.11g slot time), or
                 *    o adhoc mode (to discover neighbors)
 +               *    o ap mode in protection mode (beacons only)
                 * Frames otherwise received are discarded.
                 *    o station mode when associated (to collect state
                 *      updates such as 802.11g slot time), or
                 *    o adhoc mode (to discover neighbors)
 +               *    o ap mode in protection mode (beacons only)
                 * Frames otherwise received are discarded.
-                */ 
+                */
                if (!((ic->ic_flags & IEEE80211_F_SCAN) ||
                    (vap->iv_opmode == IEEE80211_M_STA && ni->ni_associd) ||
 -                  vap->iv_opmode == IEEE80211_M_IBSS)) {
                if (!((ic->ic_flags & IEEE80211_F_SCAN) ||
                    (vap->iv_opmode == IEEE80211_M_STA && ni->ni_associd) ||
 -                  vap->iv_opmode == IEEE80211_M_IBSS)) {
@@ -66,7 +68,7 @@ diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c madwifi-ng-r2
                        vap->iv_stats.is_rx_mgtdiscard++;
                        return;
                }
                        vap->iv_stats.is_rx_mgtdiscard++;
                        return;
                }
-@@ -2702,6 +2708,7 @@
+@@ -2650,6 +2656,7 @@
                                        break;
                                }
                                scan.erp = frm[2];
                                        break;
                                }
                                scan.erp = frm[2];
@@ -74,16 +76,7 @@ diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c madwifi-ng-r2
                                break;
                        case IEEE80211_ELEMID_RSN:
                                scan.rsn = frm;
                                break;
                        case IEEE80211_ELEMID_RSN:
                                scan.rsn = frm;
-@@ -2855,7 +2862,7 @@
-                           vap->iv_flags_ext & IEEE80211_FEXT_SWBMISS) {
-                               mod_timer(&vap->iv_swbmiss, jiffies + vap->iv_swbmiss_period);
-                       }
--                      
-+
-                       /*
-                        * If scanning, pass the info to the scan module.
-                        * Otherwise, check if it's the right time to do
-@@ -2877,6 +2884,20 @@
+@@ -2867,6 +2874,20 @@
                                ieee80211_bg_scan(vap);
                        return;
                }
                                ieee80211_bg_scan(vap);
                        return;
                }
@@ -91,11 +84,11 @@ diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c madwifi-ng-r2
 +              /* 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;
 +                      }
@@ -104,9 +97,10 @@ diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c madwifi-ng-r2
                /*
                 * If scanning, just pass information to the scan module.
                 */
                /*
                 * If scanning, just pass information to the scan module.
                 */
-diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_node.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_node.c
---- madwifi-ng-r2377-20070526.old/net80211/ieee80211_node.c    2007-05-26 18:51:09.430653864 +0200
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_node.c    2007-05-26 18:51:09.444651736 +0200
+Index: madwifi-ng-r2568-20070710/net80211/ieee80211_node.c
+===================================================================
+--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_node.c   2007-07-23 01:48:42.330392441 +0200
++++ madwifi-ng-r2568-20070710/net80211/ieee80211_node.c        2007-07-23 01:48:45.694584154 +0200
 @@ -332,10 +332,16 @@
        /* Update country ie information */
        ieee80211_build_countryie(ic);
 @@ -332,10 +332,16 @@
        /* Update country ie information */
        ieee80211_build_countryie(ic);
@@ -121,16 +115,17 @@ diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_node.c madwifi-ng-r23
 +
 +      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));
  }
-diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.c
---- madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.c   2007-05-26 18:51:09.431653712 +0200
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.c   2007-05-26 18:51:09.445651584 +0200
+Index: madwifi-ng-r2568-20070710/net80211/ieee80211_proto.c
+===================================================================
+--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_proto.c  2007-07-23 01:48:44.570520097 +0200
++++ madwifi-ng-r2568-20070710/net80211/ieee80211_proto.c       2007-07-23 01:48:45.718585522 +0200
 @@ -586,6 +586,28 @@
 @@ -586,6 +586,28 @@
-     { 4, { 2, 4, 11, 22 } },  /* IEEE80211_MODE_TURBO_G (mixed b/g) */
+       { 4, { 2, 4, 11, 22 } },        /* IEEE80211_MODE_TURBO_G (mixed b/g) */
  };
  
 +static const struct ieee80211_rateset basicpureg[] = {
  };
  
 +static const struct ieee80211_rateset basicpureg[] = {
@@ -158,15 +153,16 @@ diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.c madwifi-ng-r2
  /*
   * 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
-diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_var.h madwifi-ng-r2377-20070526.dev/net80211/ieee80211_var.h
---- madwifi-ng-r2377-20070526.old/net80211/ieee80211_var.h     2007-05-26 18:51:09.321670432 +0200
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_var.h     2007-05-26 18:51:09.445651584 +0200
-@@ -584,6 +584,8 @@
+Index: madwifi-ng-r2568-20070710/net80211/ieee80211_var.h
+===================================================================
+--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_var.h    2007-07-23 01:48:44.622523064 +0200
++++ madwifi-ng-r2568-20070710/net80211/ieee80211_var.h 2007-07-23 01:48:45.734586433 +0200
+@@ -592,6 +592,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);
 +void ieee80211_setpuregbasicrates(struct ieee80211_rateset *rs);
  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);
 +void ieee80211_setpuregbasicrates(struct ieee80211_rateset *rs);
-+              
++
  
  /* Key update synchronization methods.  XXX should not be visible. */
  static __inline void
  
  /* Key update synchronization methods.  XXX should not be visible. */
  static __inline void
Personal OpenWRT clone
This page took 0.024041 seconds and 4 git commands to generate.