diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-11-23 02:09:32 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-23 18:48:19 -0500 |
| commit | 2cfa5a0471fef43fda0b7bd87e3a5e4dbadb7809 (patch) | |
| tree | 0603cf740823a45337e2b82ba63bae96a6e75186 /drivers/net/ethernet/chelsio/cxgb3 | |
| parent | 8c2152286aabe753519d7627a2992625b97e4b20 (diff) | |
net: treewide use of RCU_INIT_POINTER
rcu_assign_pointer(ptr, NULL) can be safely replaced by
RCU_INIT_POINTER(ptr, NULL)
(old rcu_assign_pointer() macro was testing the NULL value and could
omit the smp_wmb(), but this had to be removed because of compiler
warnings)
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/chelsio/cxgb3')
| -rw-r--r-- | drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c index 90ff1318cc05..7f7882d24bc6 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c +++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | |||
| @@ -1301,7 +1301,7 @@ int cxgb3_offload_activate(struct adapter *adapter) | |||
| 1301 | 1301 | ||
| 1302 | out_free_l2t: | 1302 | out_free_l2t: |
| 1303 | t3_free_l2t(L2DATA(dev)); | 1303 | t3_free_l2t(L2DATA(dev)); |
| 1304 | rcu_assign_pointer(dev->l2opt, NULL); | 1304 | RCU_INIT_POINTER(dev->l2opt, NULL); |
| 1305 | out_free: | 1305 | out_free: |
| 1306 | kfree(t); | 1306 | kfree(t); |
| 1307 | return err; | 1307 | return err; |
| @@ -1329,7 +1329,7 @@ void cxgb3_offload_deactivate(struct adapter *adapter) | |||
| 1329 | rcu_read_lock(); | 1329 | rcu_read_lock(); |
| 1330 | d = L2DATA(tdev); | 1330 | d = L2DATA(tdev); |
| 1331 | rcu_read_unlock(); | 1331 | rcu_read_unlock(); |
| 1332 | rcu_assign_pointer(tdev->l2opt, NULL); | 1332 | RCU_INIT_POINTER(tdev->l2opt, NULL); |
| 1333 | call_rcu(&d->rcu_head, clean_l2_data); | 1333 | call_rcu(&d->rcu_head, clean_l2_data); |
| 1334 | if (t->nofail_skb) | 1334 | if (t->nofail_skb) |
| 1335 | kfree_skb(t->nofail_skb); | 1335 | kfree_skb(t->nofail_skb); |