|
|
@@ -0,0 +1,51 @@
|
|
|
+From b776ff7db868804129b9f364825fd4e949a493ee Mon Sep 17 00:00:00 2001
|
|
|
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <[email protected]>
|
|
|
+Date: Tue, 19 Sep 2017 09:36:43 +0200
|
|
|
+Subject: [PATCH] Revert "net: reduce skb_warn_bad_offload() noise"
|
|
|
+MIME-Version: 1.0
|
|
|
+Content-Type: text/plain; charset=UTF-8
|
|
|
+Content-Transfer-Encoding: 8bit
|
|
|
+
|
|
|
+This reverts commit b2504a5dbef3305ef41988ad270b0e8ec289331c.
|
|
|
+
|
|
|
+Signed-off-by: Fabian Grünbichler <[email protected]>
|
|
|
+---
|
|
|
+ net/core/dev.c | 12 +++---------
|
|
|
+ 1 file changed, 3 insertions(+), 9 deletions(-)
|
|
|
+
|
|
|
+diff --git a/net/core/dev.c b/net/core/dev.c
|
|
|
+index 73d5644fa834..7c8959936169 100644
|
|
|
+--- a/net/core/dev.c
|
|
|
++++ b/net/core/dev.c
|
|
|
+@@ -2702,12 +2702,11 @@ static inline bool skb_needs_check(struct sk_buff *skb, bool tx_path)
|
|
|
+ struct sk_buff *__skb_gso_segment(struct sk_buff *skb,
|
|
|
+ netdev_features_t features, bool tx_path)
|
|
|
+ {
|
|
|
+- struct sk_buff *segs;
|
|
|
+-
|
|
|
+ if (unlikely(skb_needs_check(skb, tx_path))) {
|
|
|
+ int err;
|
|
|
+
|
|
|
+- /* We're going to init ->check field in TCP or UDP header */
|
|
|
++ skb_warn_bad_offload(skb);
|
|
|
++
|
|
|
+ err = skb_cow_head(skb, 0);
|
|
|
+ if (err < 0)
|
|
|
+ return ERR_PTR(err);
|
|
|
+@@ -2735,12 +2734,7 @@ struct sk_buff *__skb_gso_segment(struct sk_buff *skb,
|
|
|
+ skb_reset_mac_header(skb);
|
|
|
+ skb_reset_mac_len(skb);
|
|
|
+
|
|
|
+- segs = skb_mac_gso_segment(skb, features);
|
|
|
+-
|
|
|
+- if (unlikely(skb_needs_check(skb, tx_path)))
|
|
|
+- skb_warn_bad_offload(skb);
|
|
|
+-
|
|
|
+- return segs;
|
|
|
++ return skb_mac_gso_segment(skb, features);
|
|
|
+ }
|
|
|
+ EXPORT_SYMBOL(__skb_gso_segment);
|
|
|
+
|
|
|
+--
|
|
|
+2.11.0
|
|
|
+
|