Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / net / mac80211 / tx.c

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index b65284f..82846ac 100644 (file)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -3611,7 +3611,8 @@ begin:
                 * Drop unicast frames to unauthorised stations unless they are
                 * EAPOL frames from the local station.
                 */
-               if (unlikely(!ieee80211_vif_is_mesh(&tx.sdata->vif) &&
+               if (unlikely(ieee80211_is_data(hdr->frame_control) &&
+                            !ieee80211_vif_is_mesh(&tx.sdata->vif) &&
                             tx.sdata->vif.type != NL80211_IFTYPE_OCB &&
                             !is_multicast_ether_addr(hdr->addr1) &&
                             !test_sta_flag(tx.sta, WLAN_STA_AUTHORIZED) &&