From: Florian Fainelli <f.fainelli@gmail.com>
To: alexander.levin@verizon.com
Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
johan@kernel.org, jesse@kernel.org,
Florian Fainelli <f.fainelli@gmail.com>
Subject: [PATCH stable 4.1 2/2] ipv6: Remove sit_gro_receive()
Date: Mon, 18 Sep 2017 17:51:37 -0700 [thread overview]
Message-ID: <20170919005137.31773-3-f.fainelli@gmail.com> (raw)
In-Reply-To: <20170919005137.31773-1-f.fainelli@gmail.com>
This was backported as part of 066b300e5be4 ("tunnels: Don't apply GRO
to multiple layers of encapsulation.") but nothing uses this function,
thus resulting in this build warning:
net/ipv6/ip6_offload.c:264:25: warning: 'sit_gro_receive' defined but
not used [-Wunused-function]
static struct sk_buff **sit_gro_receive(struct sk_buff **head,
^
Just drop it for now.
Fixes: 066b300e5be4 ("tunnels: Don't apply GRO to multiple layers of encapsulation.")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
net/ipv6/ip6_offload.c | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c
index 606a07890c68..1cb68e01c301 100644
--- a/net/ipv6/ip6_offload.c
+++ b/net/ipv6/ip6_offload.c
@@ -261,19 +261,6 @@ out:
return pp;
}
-static struct sk_buff **sit_gro_receive(struct sk_buff **head,
- struct sk_buff *skb)
-{
- if (NAPI_GRO_CB(skb)->encap_mark) {
- NAPI_GRO_CB(skb)->flush = 1;
- return NULL;
- }
-
- NAPI_GRO_CB(skb)->encap_mark = 1;
-
- return ipv6_gro_receive(head, skb);
-}
-
static int ipv6_gro_complete(struct sk_buff *skb, int nhoff)
{
const struct net_offload *ops;
--
2.14.1
prev parent reply other threads:[~2017-09-19 0:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-19 0:51 [PATCH stable 4.1 0/2] Remove build warnings due to backports Florian Fainelli
2017-09-19 0:51 ` [PATCH stable 4.1 1/2] of: fdt: Fix return value in __unflatten_device_tree() Florian Fainelli
2017-09-19 0:51 ` Florian Fainelli [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170919005137.31773-3-f.fainelli@gmail.com \
--to=f.fainelli@gmail.com \
--cc=alexander.levin@verizon.com \
--cc=jesse@kernel.org \
--cc=johan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®