diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-04-29 13:47:37 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-04-29 13:47:37 +0000 |
| commit | bfa2c971a022b64d408661a49159ab32e31614cf (patch) | |
| tree | c69eb2fc8b06fc089c9fb59b77a6c566c1bcb242 | |
| parent | f44934b9ae5adecdafa93654231644bee7a437f8 (diff) | |
| download | upstream-bfa2c971a022b64d408661a49159ab32e31614cf.tar.gz upstream-bfa2c971a022b64d408661a49159ab32e31614cf.tar.bz2 upstream-bfa2c971a022b64d408661a49159ab32e31614cf.zip | |
mac80211: fix WDS AP authentication issues (#11261, #11318)
SVN-Revision: 31517
| -rw-r--r-- | package/mac80211/patches/300-pending_work.patch | 10 | ||||
| -rw-r--r-- | package/mac80211/patches/550-mac80211_optimize_mcs_rate_mask.patch | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch index 79d8277ed9..668005b7f3 100644 --- a/package/mac80211/patches/300-pending_work.patch +++ b/package/mac80211/patches/300-pending_work.patch @@ -918,3 +918,13 @@ /* * No associated STAs - no need to send multicast * frames. +@@ -1159,7 +1159,8 @@ ieee80211_tx_prepare(struct ieee80211_su + tx->sta = rcu_dereference(sdata->u.vlan.sta); + if (!tx->sta && sdata->dev->ieee80211_ptr->use_4addr) + return TX_DROP; +- } else if (info->flags & IEEE80211_TX_CTL_INJECTED) { ++ } else if (info->flags & IEEE80211_TX_CTL_INJECTED || ++ tx->sdata->control_port_protocol == tx->skb->protocol) { + tx->sta = sta_info_get_bss(sdata, hdr->addr1); + } + if (!tx->sta) 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 a7e1fc1b6f..71dae84735 100644 --- a/package/mac80211/patches/550-mac80211_optimize_mcs_rate_mask.patch +++ b/package/mac80211/patches/550-mac80211_optimize_mcs_rate_mask.patch @@ -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); -@@ -2479,8 +2481,6 @@ struct sk_buff *ieee80211_beacon_get_tim +@@ -2480,8 +2482,6 @@ struct sk_buff *ieee80211_beacon_get_tim txrc.max_rate_idx = -1; else txrc.max_rate_idx = fls(txrc.rate_idx_mask) - 1; |