diff options
Diffstat (limited to 'net/mac80211/cfg.c')
-rw-r--r-- | net/mac80211/cfg.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 1309bb9c97be..55ee5a31756f 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c | |||
@@ -63,7 +63,7 @@ static int ieee80211_change_iface(struct wiphy *wiphy, | |||
63 | 63 | ||
64 | if (type == NL80211_IFTYPE_AP_VLAN && | 64 | if (type == NL80211_IFTYPE_AP_VLAN && |
65 | params && params->use_4addr == 0) | 65 | params && params->use_4addr == 0) |
66 | rcu_assign_pointer(sdata->u.vlan.sta, NULL); | 66 | RCU_INIT_POINTER(sdata->u.vlan.sta, NULL); |
67 | else if (type == NL80211_IFTYPE_STATION && | 67 | else if (type == NL80211_IFTYPE_STATION && |
68 | params && params->use_4addr >= 0) | 68 | params && params->use_4addr >= 0) |
69 | sdata->u.mgd.use_4addr = params->use_4addr; | 69 | sdata->u.mgd.use_4addr = params->use_4addr; |
@@ -557,7 +557,7 @@ static int ieee80211_config_beacon(struct ieee80211_sub_if_data *sdata, | |||
557 | 557 | ||
558 | sdata->vif.bss_conf.dtim_period = new->dtim_period; | 558 | sdata->vif.bss_conf.dtim_period = new->dtim_period; |
559 | 559 | ||
560 | rcu_assign_pointer(sdata->u.ap.beacon, new); | 560 | RCU_INIT_POINTER(sdata->u.ap.beacon, new); |
561 | 561 | ||
562 | synchronize_rcu(); | 562 | synchronize_rcu(); |
563 | 563 | ||
@@ -612,7 +612,7 @@ static int ieee80211_del_beacon(struct wiphy *wiphy, struct net_device *dev) | |||
612 | if (!old) | 612 | if (!old) |
613 | return -ENOENT; | 613 | return -ENOENT; |
614 | 614 | ||
615 | rcu_assign_pointer(sdata->u.ap.beacon, NULL); | 615 | RCU_INIT_POINTER(sdata->u.ap.beacon, NULL); |
616 | synchronize_rcu(); | 616 | synchronize_rcu(); |
617 | kfree(old); | 617 | kfree(old); |
618 | 618 | ||
@@ -904,7 +904,7 @@ static int ieee80211_change_station(struct wiphy *wiphy, | |||
904 | return -EBUSY; | 904 | return -EBUSY; |
905 | } | 905 | } |
906 | 906 | ||
907 | rcu_assign_pointer(vlansdata->u.vlan.sta, sta); | 907 | RCU_INIT_POINTER(vlansdata->u.vlan.sta, sta); |
908 | } | 908 | } |
909 | 909 | ||
910 | sta->sdata = vlansdata; | 910 | sta->sdata = vlansdata; |