UPSTREAM: net: dev_is_mac_header_xmit() true for ARPHRD_RAWIP

__bpf_redirect() and act_mirred checks this boolean
to determine whether to prefix an ethernet header.

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 3b707c3008cad04604c1f50e39f456621821c414)
Bug: 65674744
Change-Id: I79a14d064738805f4c82612b020406cd75eb872c

diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
index 3355efc8978164cd56c0b77c862511bb11122a2e..4125f60ee53b0bd267af608c5d59d5f98f9c6160 100644 (file)
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
@@ -54,6 +54,7 @@ static inline bool dev_is_mac_header_xmit(const struct net_device *dev)
        case ARPHRD_IPGRE:
        case ARPHRD_VOID:
        case ARPHRD_NONE:
+       case ARPHRD_RAWIP:
                return false;
        default:
                return true;