diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-01-26 14:28:23 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-27 18:02:57 -0500 |
commit | 13707f9e5e46342b7b16c58be91ad93a476c3ffd (patch) | |
tree | 025764fd464f83300cab236da2ce4b26c5b9703c /drivers/net/bnx2.c | |
parent | ccf434380d1a67df2dcb9113206b77d0cb0a1cef (diff) |
drivers/net: remove some rcu sparse warnings
Add missing __rcu annotations and helpers.
minor : Fix some rcu_dereference() calls in macvtap
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2.c')
-rw-r--r-- | drivers/net/bnx2.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 3dbaf58f681b..2a961b7f7e17 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
@@ -435,7 +435,8 @@ bnx2_cnic_stop(struct bnx2 *bp) | |||
435 | struct cnic_ctl_info info; | 435 | struct cnic_ctl_info info; |
436 | 436 | ||
437 | mutex_lock(&bp->cnic_lock); | 437 | mutex_lock(&bp->cnic_lock); |
438 | c_ops = bp->cnic_ops; | 438 | c_ops = rcu_dereference_protected(bp->cnic_ops, |
439 | lockdep_is_held(&bp->cnic_lock)); | ||
439 | if (c_ops) { | 440 | if (c_ops) { |
440 | info.cmd = CNIC_CTL_STOP_CMD; | 441 | info.cmd = CNIC_CTL_STOP_CMD; |
441 | c_ops->cnic_ctl(bp->cnic_data, &info); | 442 | c_ops->cnic_ctl(bp->cnic_data, &info); |
@@ -450,7 +451,8 @@ bnx2_cnic_start(struct bnx2 *bp) | |||
450 | struct cnic_ctl_info info; | 451 | struct cnic_ctl_info info; |
451 | 452 | ||
452 | mutex_lock(&bp->cnic_lock); | 453 | mutex_lock(&bp->cnic_lock); |
453 | c_ops = bp->cnic_ops; | 454 | c_ops = rcu_dereference_protected(bp->cnic_ops, |
455 | lockdep_is_held(&bp->cnic_lock)); | ||
454 | if (c_ops) { | 456 | if (c_ops) { |
455 | if (!(bp->flags & BNX2_FLAG_USING_MSIX)) { | 457 | if (!(bp->flags & BNX2_FLAG_USING_MSIX)) { |
456 | struct bnx2_napi *bnapi = &bp->bnx2_napi[0]; | 458 | struct bnx2_napi *bnapi = &bp->bnx2_napi[0]; |