aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeffreyji <jeffreyji@google.com>2022-02-17 21:23:12 +0000
committerDavid S. Miller <davem@davemloft.net>2022-02-18 11:40:52 +0000
commitaaae162aeb676f6c38e7a31b16631274f68874f4 (patch)
tree4924ae05d040a39d0a6d664013267396a20a91dd
parentMerge branch 'qca8k-phylink' (diff)
downloadlinux-dev-aaae162aeb676f6c38e7a31b16631274f68874f4.tar.xz
linux-dev-aaae162aeb676f6c38e7a31b16631274f68874f4.zip
teaming: deliver link-local packets with the link they arrive on
skb is ignored if team port is disabled. We want the skb to be delivered if it's an link layer packet. Issue is already fixed for bonding in commit b89f04c61efe ("bonding: deliver link-local packets with skb->dev set to link that packets arrived on") changelog: v2: change LLDP -> link layer in comments/commit descrip, comment format Signed-off-by: jeffreyji <jeffreyji@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/team/team.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 8b2adc56b92a..b07dde6f0abf 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -734,6 +734,11 @@ static rx_handler_result_t team_handle_frame(struct sk_buff **pskb)
port = team_port_get_rcu(skb->dev);
team = port->team;
if (!team_port_enabled(port)) {
+ if (is_link_local_ether_addr(eth_hdr(skb)->h_dest))
+ /* link-local packets are mostly useful when stack receives them
+ * with the link they arrive on.
+ */
+ return RX_HANDLER_PASS;
/* allow exact match delivery for disabled ports */
res = RX_HANDLER_EXACT;
} else {