diff options
Diffstat (limited to 'drivers/net/bnx2.c')
| -rw-r--r-- | drivers/net/bnx2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 54161aef3cac..9c5a8842ed0f 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
| @@ -2009,7 +2009,7 @@ bnx2_poll(struct net_device *dev, int *budget) | |||
| 2009 | return 1; | 2009 | return 1; |
| 2010 | } | 2010 | } |
| 2011 | 2011 | ||
| 2012 | /* Called with rtnl_lock from vlan functions and also dev->xmit_lock | 2012 | /* Called with rtnl_lock from vlan functions and also netif_tx_lock |
| 2013 | * from set_multicast. | 2013 | * from set_multicast. |
| 2014 | */ | 2014 | */ |
| 2015 | static void | 2015 | static void |
| @@ -4252,7 +4252,7 @@ bnx2_vlan_rx_kill_vid(struct net_device *dev, uint16_t vid) | |||
| 4252 | } | 4252 | } |
| 4253 | #endif | 4253 | #endif |
| 4254 | 4254 | ||
| 4255 | /* Called with dev->xmit_lock. | 4255 | /* Called with netif_tx_lock. |
| 4256 | * hard_start_xmit is pseudo-lockless - a lock is only required when | 4256 | * hard_start_xmit is pseudo-lockless - a lock is only required when |
| 4257 | * the tx queue is full. This way, we get the benefit of lockless | 4257 | * the tx queue is full. This way, we get the benefit of lockless |
| 4258 | * operations most of the time without the complexities to handle | 4258 | * operations most of the time without the complexities to handle |