From 714727277efd8074192ebc46073ca90a19dbd71c Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 10 Jan 2006 19:12:19 +0100 Subject: [PATCH] --- yaml --- r: 23291 b: refs/heads/master c: 48b2e4ce690dfbf4097e89e6ce0861ab85fd89c9 h: refs/heads/master i: 23289: 999756e8e7e8858644933375ec3c796166276b21 23287: c0adce5ff5450b40585ebc3af5e6b7afc7ef9247 v: v3 --- [refs] | 2 +- trunk/net/ieee80211/softmac/ieee80211softmac_assoc.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c65934d4bdcc..0f0a2bf7b1e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78e4f36e053b4d2c4623fdc1f6ac63f33d5b7c81 +refs/heads/master: 48b2e4ce690dfbf4097e89e6ce0861ab85fd89c9 diff --git a/trunk/net/ieee80211/softmac/ieee80211softmac_assoc.c b/trunk/net/ieee80211/softmac/ieee80211softmac_assoc.c index 9fd409099b53..dd5d5cf7189a 100644 --- a/trunk/net/ieee80211/softmac/ieee80211softmac_assoc.c +++ b/trunk/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);