Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 277935
b: refs/heads/master
c: 2cfa5a0
h: refs/heads/master
i:
  277933: bb83d5b
  277931: 0a7823c
  277927: f8ab73c
  277919: d4559c2
v: v3
  • Loading branch information
Eric Dumazet authored and David S. Miller committed Nov 23, 2011
1 parent 0fc13eb commit 754f62a
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8c2152286aabe753519d7627a2992625b97e4b20
refs/heads/master: 2cfa5a0471fef43fda0b7bd87e3a5e4dbadb7809
2 changes: 1 addition & 1 deletion trunk/drivers/net/ethernet/broadcom/bnx2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ static int bnx2_unregister_cnic(struct net_device *dev)
mutex_lock(&bp->cnic_lock);
cp->drv_state = 0;
bnapi->cnic_present = 0;
rcu_assign_pointer(bp->cnic_ops, NULL);
RCU_INIT_POINTER(bp->cnic_ops, NULL);
mutex_unlock(&bp->cnic_lock);
synchronize_rcu();
return 0;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11587,7 +11587,7 @@ static int bnx2x_unregister_cnic(struct net_device *dev)

mutex_lock(&bp->cnic_mutex);
cp->drv_state = 0;
rcu_assign_pointer(bp->cnic_ops, NULL);
RCU_INIT_POINTER(bp->cnic_ops, NULL);
mutex_unlock(&bp->cnic_mutex);
synchronize_rcu();
kfree(bp->cnic_kwq);
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/net/ethernet/broadcom/cnic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ int cnic_unregister_driver(int ulp_type)
}
read_unlock(&cnic_dev_lock);

rcu_assign_pointer(cnic_ulp_tbl[ulp_type], NULL);
RCU_INIT_POINTER(cnic_ulp_tbl[ulp_type], NULL);

mutex_unlock(&cnic_lock);
synchronize_rcu();
Expand Down Expand Up @@ -579,7 +579,7 @@ static int cnic_unregister_device(struct cnic_dev *dev, int ulp_type)
}
mutex_lock(&cnic_lock);
if (rcu_dereference(cp->ulp_ops[ulp_type])) {
rcu_assign_pointer(cp->ulp_ops[ulp_type], NULL);
RCU_INIT_POINTER(cp->ulp_ops[ulp_type], NULL);
cnic_put(dev);
} else {
pr_err("%s: device not registered to this ulp type %d\n",
Expand Down Expand Up @@ -5134,7 +5134,7 @@ static void cnic_stop_hw(struct cnic_dev *dev)
}
cnic_shutdown_rings(dev);
clear_bit(CNIC_F_CNIC_UP, &dev->flags);
rcu_assign_pointer(cp->ulp_ops[CNIC_ULP_L4], NULL);
RCU_INIT_POINTER(cp->ulp_ops[CNIC_ULP_L4], NULL);
synchronize_rcu();
cnic_cm_shutdown(dev);
cp->stop_hw(dev);
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1301,7 +1301,7 @@ int cxgb3_offload_activate(struct adapter *adapter)

out_free_l2t:
t3_free_l2t(L2DATA(dev));
rcu_assign_pointer(dev->l2opt, NULL);
RCU_INIT_POINTER(dev->l2opt, NULL);
out_free:
kfree(t);
return err;
Expand Down Expand Up @@ -1329,7 +1329,7 @@ void cxgb3_offload_deactivate(struct adapter *adapter)
rcu_read_lock();
d = L2DATA(tdev);
rcu_read_unlock();
rcu_assign_pointer(tdev->l2opt, NULL);
RCU_INIT_POINTER(tdev->l2opt, NULL);
call_rcu(&d->rcu_head, clean_l2_data);
if (t->nofail_skb)
kfree_skb(t->nofail_skb);
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/net/macvtap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ static void macvtap_put_queue(struct macvtap_queue *q)
if (vlan) {
int index = get_slot(vlan, q);

rcu_assign_pointer(vlan->taps[index], NULL);
rcu_assign_pointer(q->vlan, NULL);
RCU_INIT_POINTER(vlan->taps[index], NULL);
RCU_INIT_POINTER(q->vlan, NULL);
sock_put(&q->sk);
--vlan->numvtaps;
}
Expand Down Expand Up @@ -223,8 +223,8 @@ static void macvtap_del_queues(struct net_device *dev)
lockdep_is_held(&macvtap_lock));
if (q) {
qlist[j++] = q;
rcu_assign_pointer(vlan->taps[i], NULL);
rcu_assign_pointer(q->vlan, NULL);
RCU_INIT_POINTER(vlan->taps[i], NULL);
RCU_INIT_POINTER(q->vlan, NULL);
vlan->numvtaps--;
}
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/ppp/pptp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ static void del_chan(struct pppox_sock *sock)
{
spin_lock(&chan_lock);
clear_bit(sock->proto.pptp.src_addr.call_id, callid_bitmap);
rcu_assign_pointer(callid_sock[sock->proto.pptp.src_addr.call_id], NULL);
RCU_INIT_POINTER(callid_sock[sock->proto.pptp.src_addr.call_id], NULL);
spin_unlock(&chan_lock);
synchronize_rcu();
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/team/team_mode_activebackup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ static bool ab_transmit(struct team *team, struct sk_buff *skb)
static void ab_port_leave(struct team *team, struct team_port *port)
{
if (ab_priv(team)->active_port == port)
rcu_assign_pointer(ab_priv(team)->active_port, NULL);
RCU_INIT_POINTER(ab_priv(team)->active_port, NULL);
}

static int ab_active_port_get(struct team *team, void *arg)
Expand Down
12 changes: 6 additions & 6 deletions trunk/drivers/net/wireless/ath/carl9170/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ static void carl9170_op_stop(struct ieee80211_hw *hw)

mutex_lock(&ar->mutex);
if (IS_ACCEPTING_CMD(ar)) {
rcu_assign_pointer(ar->beacon_iter, NULL);
RCU_INIT_POINTER(ar->beacon_iter, NULL);

carl9170_led_set_state(ar, 0);

Expand Down Expand Up @@ -678,7 +678,7 @@ static int carl9170_op_add_interface(struct ieee80211_hw *hw,
vif_priv->active = false;
bitmap_release_region(&ar->vif_bitmap, vif_id, 0);
ar->vifs--;
rcu_assign_pointer(ar->vif_priv[vif_id].vif, NULL);
RCU_INIT_POINTER(ar->vif_priv[vif_id].vif, NULL);
list_del_rcu(&vif_priv->list);
mutex_unlock(&ar->mutex);
synchronize_rcu();
Expand Down Expand Up @@ -716,7 +716,7 @@ static void carl9170_op_remove_interface(struct ieee80211_hw *hw,
WARN_ON(vif_priv->enable_beacon);
vif_priv->enable_beacon = false;
list_del_rcu(&vif_priv->list);
rcu_assign_pointer(ar->vif_priv[id].vif, NULL);
RCU_INIT_POINTER(ar->vif_priv[id].vif, NULL);

if (vif == main_vif) {
rcu_read_unlock();
Expand Down Expand Up @@ -1258,7 +1258,7 @@ static int carl9170_op_sta_add(struct ieee80211_hw *hw,
}

for (i = 0; i < CARL9170_NUM_TID; i++)
rcu_assign_pointer(sta_info->agg[i], NULL);
RCU_INIT_POINTER(sta_info->agg[i], NULL);

sta_info->ampdu_max_len = 1 << (3 + sta->ht_cap.ampdu_factor);
sta_info->ht_sta = true;
Expand All @@ -1285,7 +1285,7 @@ static int carl9170_op_sta_remove(struct ieee80211_hw *hw,
struct carl9170_sta_tid *tid_info;

tid_info = rcu_dereference(sta_info->agg[i]);
rcu_assign_pointer(sta_info->agg[i], NULL);
RCU_INIT_POINTER(sta_info->agg[i], NULL);

if (!tid_info)
continue;
Expand Down Expand Up @@ -1398,7 +1398,7 @@ static int carl9170_op_ampdu_action(struct ieee80211_hw *hw,
spin_unlock_bh(&ar->tx_ampdu_list_lock);
}

rcu_assign_pointer(sta_info->agg[tid], NULL);
RCU_INIT_POINTER(sta_info->agg[tid], NULL);
rcu_read_unlock();

ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
Expand Down
4 changes: 2 additions & 2 deletions trunk/net/core/netprio_cgroup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ static int netprio_device_event(struct notifier_block *unused,
break;
case NETDEV_UNREGISTER:
old = rtnl_dereference(dev->priomap);
rcu_assign_pointer(dev->priomap, NULL);
RCU_INIT_POINTER(dev->priomap, NULL);
if (old)
kfree_rcu(old, rcu);
break;
Expand Down Expand Up @@ -332,7 +332,7 @@ static void __exit exit_cgroup_netprio(void)
rtnl_lock();
for_each_netdev(&init_net, dev) {
old = rtnl_dereference(dev->priomap);
rcu_assign_pointer(dev->priomap, NULL);
RCU_INIT_POINTER(dev->priomap, NULL);
if (old)
kfree_rcu(old, rcu);
}
Expand Down

0 comments on commit 754f62a

Please sign in to comment.