X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=net%2Fmac80211%2Fiface.c;h=7032a2b59249cb2d42c3c38aaeec0cc57a4741ba;hb=9d31d2338950293ec19d9b095fbaa9030899dcb4;hp=b80c9b016b2bec7ee007a9094b262b655d9e4d5e;hpb=09d78dde88ef95a27b54a6e450ee700ccabdf39d;p=linux-2.6-microblaze.git

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index b80c9b016b2b..7032a2b59249 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -15,6 +15,7 @@
 #include <linux/if_arp.h>
 #include <linux/netdevice.h>
 #include <linux/rtnetlink.h>
+#include <linux/kcov.h>
 #include <net/mac80211.h>
 #include <net/ieee80211_radiotap.h>
 #include "ieee80211_i.h"
@@ -807,7 +808,8 @@ static bool ieee80211_set_sdata_offload_flags(struct ieee80211_sub_if_data *sdat
 	    ieee80211_iftype_supports_hdr_offload(sdata->vif.type)) {
 		flags |= IEEE80211_OFFLOAD_DECAP_ENABLED;
 
-		if (local->monitors)
+		if (local->monitors &&
+		    !ieee80211_hw_check(&local->hw, SUPPORTS_CONC_MON_RX_DECAP))
 			flags &= ~IEEE80211_OFFLOAD_DECAP_ENABLED;
 	} else {
 		flags &= ~IEEE80211_OFFLOAD_DECAP_ENABLED;