diff options
| author | Amerigo Wang <amwang@redhat.com> | 2012-08-10 01:24:45 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-14 21:33:32 (GMT) |
| commit | e15c3c2294605f09f9b336b2f3b97086ab4b8145 (patch) | |
| tree | 913bd57b5fa899687c779530d0576a3ca8100732 /drivers/net | |
| parent | 4e3828c4bfd90b00a951cad7c8da27d1966beefe (diff) | |
| download | linux-e15c3c2294605f09f9b336b2f3b97086ab4b8145.tar.xz | |
netpoll: check netpoll tx status on the right device
Although this doesn't matter actually, because netpoll_tx_running()
doesn't use the parameter, the code will be more readable.
For team_dev_queue_xmit() we have to move it down to avoid
compile errors.
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index e428916..d688a8a 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -398,7 +398,7 @@ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, sizeof(qdisc_skb_cb(skb)->slave_dev_queue_mapping)); skb->queue_mapping = qdisc_skb_cb(skb)->slave_dev_queue_mapping; - if (unlikely(netpoll_tx_running(slave_dev))) + if (unlikely(netpoll_tx_running(bond->dev))) bond_netpoll_send_skb(bond_get_slave_by_dev(bond, slave_dev), skb); else dev_queue_xmit(skb); |