diff options
| author | Chonggang Li <chonggangli@google.com> | 2017-04-16 21:02:18 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-17 21:45:47 +0200 |
| commit | b89f04c61efe3b7756434d693b9203cc0cce002e (patch) | |
| tree | 694c8d19d40a4b771340410482e7e26fcb822810 /drivers/net/bonding/bond_main.c | |
| parent | net: rtnetlink: plumb extended ack to doit function (diff) | |
| download | linux-b89f04c61efe3b7756434d693b9203cc0cce002e.tar.xz linux-b89f04c61efe3b7756434d693b9203cc0cce002e.zip | |
bonding: deliver link-local packets with skb->dev set to link that packets arrived on
Bonding driver changes the skb->dev to the bonding-master before
passing the packet to stack for further processing. This, however
does not make sense for the link-local packets and it loses "the
link info" once its skb->dev is changed to bonding-master. This
patch changes this behavior for link-local packets by not changing
the skb->dev to the bonding-master and maintaining it as it is,
i.e. the link on which the packet arrived.
Signed-off-by: Chonggang Li <chonggangli@google.com>
Signed-off-by: Mahesh Bandewar <maheshb@google.com>
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 01e4a69af421..6bd3b50faf48 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1176,6 +1176,9 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb) } } + /* don't change skb->dev for link-local packets */ + if (is_link_local_ether_addr(eth_hdr(skb)->h_dest)) + return RX_HANDLER_PASS; if (bond_should_deliver_exact_match(skb, slave, bond)) return RX_HANDLER_EXACT; |