diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2008-11-02 13:04:36 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2008-11-02 13:04:36 +0000 |
| commit | dec207d4eb4927112242da74afd1179d137fb1ad (patch) | |
| tree | 78dcafe3c951ea7e417aca01bd04b6e59c83f025 /package/madwifi/patches/346-protmode_trig.patch | |
| parent | 891b476e67c64477aac32094a29f3345e742da45 (diff) | |
| download | upstream-dec207d4eb4927112242da74afd1179d137fb1ad.tar.gz upstream-dec207d4eb4927112242da74afd1179d137fb1ad.tar.bz2 upstream-dec207d4eb4927112242da74afd1179d137fb1ad.zip | |
madwifi: fix noderef and state machine issues in the currently unused ap-to-ap wds mode; refresh patches
SVN-Revision: 13096
Diffstat (limited to 'package/madwifi/patches/346-protmode_trig.patch')
| -rw-r--r-- | package/madwifi/patches/346-protmode_trig.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/package/madwifi/patches/346-protmode_trig.patch b/package/madwifi/patches/346-protmode_trig.patch index 0abae5181c..1364c559b2 100644 --- a/package/madwifi/patches/346-protmode_trig.patch +++ b/package/madwifi/patches/346-protmode_trig.patch @@ -1,6 +1,6 @@ --- a/net80211/ieee80211.c +++ b/net80211/ieee80211.c -@@ -333,7 +333,9 @@ +@@ -333,7 +333,9 @@ ieee80211_ifattach(struct ieee80211com * IEEE80211_MS_TO_TU(IEEE80211_BMISSTHRESH_DEFAULT_MS), ic->ic_lintval), ic->ic_lintval); } @@ -13,7 +13,7 @@ TAILQ_INIT(&ic->ic_vaps); --- a/net80211/ieee80211_input.c +++ b/net80211/ieee80211_input.c -@@ -3411,14 +3411,18 @@ +@@ -3411,14 +3411,18 @@ ieee80211_recv_mgmt(struct ieee80211vap IEEE80211_IS_CHAN_ANYG(ic->ic_curchan)) { /* Assume no ERP IE == 11b AP */ @@ -39,7 +39,7 @@ --- a/net80211/ieee80211_ioctl.h +++ b/net80211/ieee80211_ioctl.h -@@ -643,6 +643,8 @@ +@@ -643,6 +643,8 @@ enum { IEEE80211_PARAM_BEACON_MISS_THRESH_MS = 74, /* Beacon miss threshold (in ms) */ IEEE80211_PARAM_MAXRATE = 75, /* Maximum rate (by table index) */ IEEE80211_PARAM_MINRATE = 76, /* Maximum rate (by table index) */ @@ -60,7 +60,7 @@ #define IEEE80211_PWRCONSTRAINT_VAL(ic) \ (((ic)->ic_bsschan->ic_maxregpower > (ic)->ic_curchanmaxpwr) ? \ (ic)->ic_bsschan->ic_maxregpower - (ic)->ic_curchanmaxpwr : 0) -@@ -324,6 +327,9 @@ +@@ -324,6 +327,9 @@ struct ieee80211com { u_int16_t ic_newtxpowlimit; /* tx power limit to change to (in 0.5 dBm) */ u_int16_t ic_uapsdmaxtriggers; /* max triggers that could arrive */ u_int8_t ic_coverageclass; /* coverage class */ @@ -72,7 +72,7 @@ * --- a/net80211/ieee80211_wireless.c +++ b/net80211/ieee80211_wireless.c -@@ -2312,6 +2312,12 @@ +@@ -2312,6 +2312,12 @@ ieee80211_ioctl_setparam(struct net_devi IEEE80211_IS_CHAN_ANYG(ic->ic_bsschan)) retv = ENETRESET; break; @@ -85,7 +85,7 @@ case IEEE80211_PARAM_MCASTCIPHER: if ((vap->iv_caps & cipher2cap(value)) == 0 && !ieee80211_crypto_available(vap, value)) -@@ -2955,6 +2961,12 @@ +@@ -2955,6 +2961,12 @@ ieee80211_ioctl_getparam(struct net_devi case IEEE80211_PARAM_PROTMODE: param[0] = ic->ic_protmode; break; @@ -98,7 +98,7 @@ case IEEE80211_PARAM_MCASTCIPHER: param[0] = rsn->rsn_mcastcipher; break; -@@ -5346,6 +5358,14 @@ +@@ -5346,6 +5358,14 @@ static const struct iw_priv_args ieee802 IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "protmode" }, { IEEE80211_PARAM_PROTMODE, 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_protmode" }, @@ -115,7 +115,7 @@ { IEEE80211_PARAM_MCASTCIPHER, --- a/net80211/ieee80211_node.c +++ b/net80211/ieee80211_node.c -@@ -1877,6 +1877,17 @@ +@@ -1877,6 +1877,17 @@ ieee80211_node_timeout(unsigned long arg ieee80211_scan_timeout(ic); ieee80211_timeout_stations(&ic->ic_sta); |