diff options
Diffstat (limited to 'net/mac80211/ieee80211.c')
-rw-r--r-- | net/mac80211/ieee80211.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c index b1180536c335..2501bff0d15e 100644 --- a/net/mac80211/ieee80211.c +++ b/net/mac80211/ieee80211.c | |||
@@ -59,10 +59,10 @@ static void ieee80211_configure_filter(struct ieee80211_local *local) | |||
59 | unsigned int changed_flags; | 59 | unsigned int changed_flags; |
60 | unsigned int new_flags = 0; | 60 | unsigned int new_flags = 0; |
61 | 61 | ||
62 | if (local->iff_promiscs) | 62 | if (atomic_read(&local->iff_promiscs)) |
63 | new_flags |= FIF_PROMISC_IN_BSS; | 63 | new_flags |= FIF_PROMISC_IN_BSS; |
64 | 64 | ||
65 | if (local->iff_allmultis) | 65 | if (atomic_read(&local->iff_allmultis)) |
66 | new_flags |= FIF_ALLMULTI; | 66 | new_flags |= FIF_ALLMULTI; |
67 | 67 | ||
68 | if (local->monitors) | 68 | if (local->monitors) |
@@ -521,17 +521,17 @@ static void ieee80211_set_multicast_list(struct net_device *dev) | |||
521 | 521 | ||
522 | if (allmulti != sdata_allmulti) { | 522 | if (allmulti != sdata_allmulti) { |
523 | if (dev->flags & IFF_ALLMULTI) | 523 | if (dev->flags & IFF_ALLMULTI) |
524 | local->iff_allmultis++; | 524 | atomic_inc(&local->iff_allmultis); |
525 | else | 525 | else |
526 | local->iff_allmultis--; | 526 | atomic_dec(&local->iff_allmultis); |
527 | sdata->flags ^= IEEE80211_SDATA_ALLMULTI; | 527 | sdata->flags ^= IEEE80211_SDATA_ALLMULTI; |
528 | } | 528 | } |
529 | 529 | ||
530 | if (promisc != sdata_promisc) { | 530 | if (promisc != sdata_promisc) { |
531 | if (dev->flags & IFF_PROMISC) | 531 | if (dev->flags & IFF_PROMISC) |
532 | local->iff_promiscs++; | 532 | atomic_inc(&local->iff_promiscs); |
533 | else | 533 | else |
534 | local->iff_promiscs--; | 534 | atomic_dec(&local->iff_promiscs); |
535 | sdata->flags ^= IEEE80211_SDATA_PROMISC; | 535 | sdata->flags ^= IEEE80211_SDATA_PROMISC; |
536 | } | 536 | } |
537 | 537 | ||