diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-09 20:17:24 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-09 20:17:24 +0100 |
| commit | f6d773cd4f3c18c40ab25a5cb92453756237840e (patch) | |
| tree | 5631a6ea4495ae2eb5058fb63b25dea3b197d61b /net/mac80211/cfg.c | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne... (diff) | |
| parent | mwl8k: use integral index instead of pointer for driver_data (diff) | |
| download | linux-f6d773cd4f3c18c40ab25a5cb92453756237840e.tar.xz linux-f6d773cd4f3c18c40ab25a5cb92453756237840e.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 7b5131bd6fa1..56319b51d170 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -738,13 +738,6 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev, err = sta_info_insert(sta); if (err) { - /* STA has been freed */ - if (err == -EEXIST && layer2_update) { - /* Need to update layer 2 devices on reassociation */ - sta = sta_info_get(local, mac); - if (sta) - ieee80211_send_layer2_update(sta); - } rcu_read_unlock(); return err; } |