From: Maciej Żenczykowski <maze@google.com>
Date: Thu, 24 Jan 2019 11:07:02 +0000 (-0800)
Subject: net: dev_is_mac_header_xmit() true for ARPHRD_RAWIP
X-Git-Tag: v4.14.105~16
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8a1e11f6ab05cf04f625bf48212dd00ee1f5ed58;p=users%2Fjedix%2Flinux-maple.git

net: dev_is_mac_header_xmit() true for ARPHRD_RAWIP

[ Upstream commit 3b707c3008cad04604c1f50e39f456621821c414 ]

__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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
index 3355efc897816..4125f60ee53b0 100644
--- 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;