[PATCH][Bionic/Focal/Hirsute/Impish linux] net: handle ARPHRD_IP6GRE in dev_is_mac_header_xmit()

Tim Gardner tim.gardner at canonical.com
Tue Oct 19 14:50:21 UTC 2021


From: Guillaume Nault <gnault at redhat.com>

BugLink: https://bugs.launchpad.net/bugs/1947164

Similar to commit 3b707c3008ca ("net: dev_is_mac_header_xmit() true for
ARPHRD_RAWIP"), add ARPHRD_IP6GRE to dev_is_mac_header_xmit(), to make
ip6gre compatible with act_mirred and __bpf_redirect().

Signed-off-by: Guillaume Nault <gnault at redhat.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
(cherry picked from commit a3fa449ffcf5bcf9c3dddf62c11599cdc79ef54a)
Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 include/linux/if_arp.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
index bf5c5f32c65e..b712217f7030 100644
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
@@ -48,6 +48,7 @@ static inline bool dev_is_mac_header_xmit(const struct net_device *dev)
 	case ARPHRD_TUNNEL6:
 	case ARPHRD_SIT:
 	case ARPHRD_IPGRE:
+	case ARPHRD_IP6GRE:
 	case ARPHRD_VOID:
 	case ARPHRD_NONE:
 	case ARPHRD_RAWIP:
-- 
2.33.1




More information about the kernel-team mailing list