diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-07-10 00:21:25 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-07-10 00:21:25 +0000 |
| commit | b01eb369ce4b236f214c74dc7a30f65474ddf8d3 (patch) | |
| tree | 5b2c6f7f1a90ddd05e706bbe1dbce54223eea283 /package/mac80211/patches/550-mac80211_optimize_mcs_rate_mask.patch | |
| parent | 718ffca5834751d2a352dd7a1fc6b9c09b0aeef5 (diff) | |
mac80211: update to latest version, fix tx gain patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32655 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/550-mac80211_optimize_mcs_rate_mask.patch')
| -rw-r--r-- | package/mac80211/patches/550-mac80211_optimize_mcs_rate_mask.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/mac80211/patches/550-mac80211_optimize_mcs_rate_mask.patch b/package/mac80211/patches/550-mac80211_optimize_mcs_rate_mask.patch index ea066a843c..ae962b5a17 100644 --- a/package/mac80211/patches/550-mac80211_optimize_mcs_rate_mask.patch +++ b/package/mac80211/patches/550-mac80211_optimize_mcs_rate_mask.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -702,6 +702,8 @@ struct ieee80211_sub_if_data { +@@ -710,6 +710,8 @@ struct ieee80211_sub_if_data { /* bitmap of allowed (non-MCS) rate indexes for rate control */ u32 rc_rateidx_mask[IEEE80211_NUM_BANDS]; @@ -11,7 +11,7 @@ union { --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -2119,9 +2119,20 @@ static int ieee80211_set_bitrate_mask(st +@@ -2135,9 +2135,20 @@ static int ieee80211_set_bitrate_mask(st } for (i = 0; i < IEEE80211_NUM_BANDS; i++) { @@ -34,7 +34,7 @@ return 0; --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -3676,7 +3676,7 @@ void ieee80211_send_bar(struct ieee80211 +@@ -3665,7 +3665,7 @@ void ieee80211_send_bar(struct ieee80211 * (deprecated; this will be removed once drivers get updated to use * rate_idx_mask) * @rate_idx_mask: user-requested (legacy) rate mask @@ -43,7 +43,7 @@ * @bss: whether this frame is sent out in AP or IBSS mode */ struct ieee80211_tx_rate_control { -@@ -3688,7 +3688,7 @@ struct ieee80211_tx_rate_control { +@@ -3677,7 +3677,7 @@ struct ieee80211_tx_rate_control { bool rts, short_preamble; u8 max_rate_idx; u32 rate_idx_mask; @@ -54,7 +54,7 @@ --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -637,9 +637,11 @@ ieee80211_tx_h_rate_ctrl(struct ieee8021 +@@ -624,9 +624,11 @@ ieee80211_tx_h_rate_ctrl(struct ieee8021 txrc.max_rate_idx = -1; else txrc.max_rate_idx = fls(txrc.rate_idx_mask) - 1; @@ -69,7 +69,7 @@ txrc.bss = (tx->sdata->vif.type == NL80211_IFTYPE_AP || tx->sdata->vif.type == NL80211_IFTYPE_MESH_POINT || tx->sdata->vif.type == NL80211_IFTYPE_ADHOC); -@@ -2475,8 +2477,6 @@ struct sk_buff *ieee80211_beacon_get_tim +@@ -2454,8 +2456,6 @@ struct sk_buff *ieee80211_beacon_get_tim txrc.max_rate_idx = -1; else txrc.max_rate_idx = fls(txrc.rate_idx_mask) - 1; |