diff options
| author | David S. Miller <davem@davemloft.net> | 2015-04-02 16:16:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-02 16:16:53 -0400 |
| commit | 9f0d34bc344889c2e6c593bd949d7ab821f0f4a5 (patch) | |
| tree | e5bfc776a09315afa4dbcae97ac04f2cca239c96 /drivers/net/bonding | |
| parent | e4a924f5768c55002c02ceba9b9f86824c35f956 (diff) | |
| parent | 0a4812798fae4f6bfcaab51e31b3898ff5ea3108 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/usb/asix_common.c
drivers/net/usb/sr9800.c
drivers/net/usb/usbnet.c
include/linux/usb/usbnet.h
net/ipv4/tcp_ipv4.c
net/ipv6/tcp_ipv6.c
The TCP conflicts were overlapping changes. In 'net' we added a
READ_ONCE() to the socket cached RX route read, whilst in 'net-next'
Eric Dumazet touched the surrounding code dealing with how mini
sockets are handled.
With USB, it's a case of the same bug fix first going into net-next
and then I cherry picked it back into net.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 7b4684ccdb3f..78dde56ae6e6 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
| @@ -3881,7 +3881,8 @@ static inline int bond_slave_override(struct bonding *bond, | |||
| 3881 | /* Find out if any slaves have the same mapping as this skb. */ | 3881 | /* Find out if any slaves have the same mapping as this skb. */ |
| 3882 | bond_for_each_slave_rcu(bond, slave, iter) { | 3882 | bond_for_each_slave_rcu(bond, slave, iter) { |
| 3883 | if (slave->queue_id == skb->queue_mapping) { | 3883 | if (slave->queue_id == skb->queue_mapping) { |
| 3884 | if (bond_slave_can_tx(slave)) { | 3884 | if (bond_slave_is_up(slave) && |
| 3885 | slave->link == BOND_LINK_UP) { | ||
| 3885 | bond_dev_queue_xmit(bond, skb, slave->dev); | 3886 | bond_dev_queue_xmit(bond, skb, slave->dev); |
| 3886 | return 0; | 3887 | return 0; |
| 3887 | } | 3888 | } |