aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorNicolas Dichtel <nicolas.dichtel@6wind.com>2023-08-23 15:41:02 +0200
committerDavid S. Miller <davem@davemloft.net>2023-08-25 08:08:27 +0100
commita4f39c9f14a634e4cd35fcd338c239d11fcc73fc (patch)
tree3667361064368223b49ab48c3f185eafe7fb0083
parentnet/mlx5: Dynamic cyclecounter shift calculation for PTP free running clock (diff)
downloadwireguard-linux-a4f39c9f14a634e4cd35fcd338c239d11fcc73fc.tar.xz
wireguard-linux-a4f39c9f14a634e4cd35fcd338c239d11fcc73fc.zip
net: handle ARPHRD_PPP in dev_is_mac_header_xmit()
The goal is to support a bpf_redirect() from an ethernet device (ingress) to a ppp device (egress). The l2 header is added automatically by the ppp driver, thus the ethernet header should be removed. CC: stable@vger.kernel.org Fixes: 27b29f63058d ("bpf: add bpf_redirect() helper") Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Tested-by: Siwar Zitouni <siwar.zitouni@6wind.com> Reviewed-by: Guillaume Nault <gnault@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/if_arp.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
index 1ed52441972f..10a1e81434cb 100644
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
@@ -53,6 +53,10 @@ static inline bool dev_is_mac_header_xmit(const struct net_device *dev)
case ARPHRD_NONE:
case ARPHRD_RAWIP:
case ARPHRD_PIMREG:
+ /* PPP adds its l2 header automatically in ppp_start_xmit().
+ * This makes it look like an l3 device to __bpf_redirect() and tcf_mirred_init().
+ */
+ case ARPHRD_PPP:
return false;
default:
return true;