summaryrefslogtreecommitdiffstats
path: root/net/mac80211/tx.c
diff options
context:
space:
mode:
authorBob Copeland <me@bobcopeland.com>2015-06-13 16:16:31 +0200
committerJohannes Berg <johannes.berg@intel.com>2015-07-17 15:38:17 +0200
commit3633ebebab2bbe88124388b7620442315c968e8f (patch)
tree2ceb000633d8bcd10bfd16adf85c56e933cb0bcd /net/mac80211/tx.c
parentmac80211: mac80211: Check SN for deactivated mpaths (diff)
downloadlinux-3633ebebab2bbe88124388b7620442315c968e8f.tar.xz
linux-3633ebebab2bbe88124388b7620442315c968e8f.zip
mac80211: enable assoc check for mesh interfaces
We already set a station to be associated when peering completes, both in user space and in the kernel. Thus we should always have an associated sta before sending data frames to that station. Failure to check assoc state can cause crashes in the lower-level driver due to transmitting unicast data frames before driver sta structures (e.g. ampdu state in ath9k) are initialized. This occurred when forwarding in the presence of fixed mesh paths: frames were transmitted to stations with whom we hadn't yet completed peering. Cc: stable@vger.kernel.org Reported-by: Alexis Green <agreen@cococorp.com> Tested-by: Jesse Jones <jjones@cococorp.com> Signed-off-by: Bob Copeland <me@bobcopeland.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to '')
-rw-r--r--net/mac80211/tx.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 7c6832f91dc3..c0d6af809640 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -311,9 +311,6 @@ ieee80211_tx_h_check_assoc(struct ieee80211_tx_data *tx)
if (tx->sdata->vif.type == NL80211_IFTYPE_WDS)
return TX_CONTINUE;
- if (tx->sdata->vif.type == NL80211_IFTYPE_MESH_POINT)
- return TX_CONTINUE;
-
if (tx->flags & IEEE80211_TX_PS_BUFFERED)
return TX_CONTINUE;