diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-18 13:55:32 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-18 13:55:32 -0500 |
| commit | dfef948ed2ba69cf041840b5e860d6b4e16fa0b1 (patch) | |
| tree | eab385cabe589346bcf19385c997ab8dabaef7bd /net/mac80211/sta_info.c | |
| parent | ea31ba359c55e0734ff895692185d4c50cf0c537 (diff) | |
| parent | c85e9d7739fc8d879c4293ea020760926d6f87cd (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/sta_info.c')
| -rw-r--r-- | net/mac80211/sta_info.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index be59456e8a42..396a94806de9 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c | |||
| @@ -509,6 +509,9 @@ static void __sta_info_unlink(struct sta_info **sta) | |||
| 509 | local->num_sta--; | 509 | local->num_sta--; |
| 510 | local->sta_generation++; | 510 | local->sta_generation++; |
| 511 | 511 | ||
| 512 | if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) | ||
| 513 | rcu_assign_pointer(sdata->u.vlan.sta, NULL); | ||
| 514 | |||
| 512 | if (local->ops->sta_notify) { | 515 | if (local->ops->sta_notify) { |
| 513 | if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) | 516 | if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) |
| 514 | sdata = container_of(sdata->bss, | 517 | sdata = container_of(sdata->bss, |