diff --git a/[refs] b/[refs]
index b612aedffa8f..baa2ed52b9b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf63495d0dbe435b475a44672f5dee150da6471b
+refs/heads/master: 2c31333a8fde7e26936a9f5371d02ff12c490993
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index 902b03ee8f60..3c87293cb078 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -2247,6 +2247,10 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_data *rx)
 		break;
 	case cpu_to_le16(IEEE80211_STYPE_DEAUTH):
 	case cpu_to_le16(IEEE80211_STYPE_DISASSOC):
+		if (is_multicast_ether_addr(mgmt->da) &&
+		    !is_broadcast_ether_addr(mgmt->da))
+			return RX_DROP_MONITOR;
+
 		/* process only for station */
 		if (sdata->vif.type != NL80211_IFTYPE_STATION)
 			return RX_DROP_MONITOR;