1 files changed, 4 insertions, 1 deletions

diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c
index 9fd409099b53..dd5d5cf7189a 100644
--- a/net/ieee80211/softmac/ieee80211softmac_assoc.c
+++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c
@@ -349,7 +349,10 @@ ieee80211softmac_handle_disassoc(struct net_device * dev,
 {
         struct ieee80211softmac_device *mac = ieee80211_priv(dev);
         unsigned long flags;
-        /* FIXME: check that this frame is from the right AP!! */
+        if (memcmp(disassoc->header.addr2, mac->associnfo.bssid, ETH_ALEN))
+                return 0;
+        if (memcmp(disassoc->header.addr1, mac->dev->dev_addr, ETH_ALEN))
+                return 0;
         dprintk(KERN_INFO PFX "got disassoc frame\n");
         netif_carrier_off(dev);
         spin_lock_irqsave(&mac->lock, flags);