[PATCH net-next] net: increase LL_MAX_HEADER if HYPERV_NET is enabled
From: Eric Dumazet <hidden>
Date: 2015-11-01 17:21:02
Subsystem:
networking drivers, networking [general], the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
From: Eric Dumazet <edumazet@google.com>
My recent commit, attaching SYNACK messages to request sockets
exposed a too small LL_MAX_HEADER when netvsc_drv.c is in use,
because this driver sets a needed_headroom of 220 bytes.
Increase LL_MAX_HEADER in this case, to avoid a realloc of all
TCP frames.
In another patch, I'll make skb_set_owner_w() more robust.
Fixes: ca6fb0651883 ("tcp: attach SYNACK messages to request sockets instead of listener")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Bisected-by: Haiyang Zhang [off-list ref]
---
include/linux/netdevice.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 4ac653b7b8ac..04e3864e660e 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h@@ -132,8 +132,10 @@ static inline bool dev_xmit_complete(int rc) * used. */ -#if defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25) -# if defined(CONFIG_MAC80211_MESH) +#if defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25) || IS_ENABLED(CONFIG_HYPERV_NET) +# if IS_ENABLED(CONFIG_HYPERV_NET) +# define LL_MAX_HEADER 256 +# elif defined(CONFIG_MAC80211_MESH) # define LL_MAX_HEADER 128 # else # define LL_MAX_HEADER 96