From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751465AbdISAwD (ORCPT ); Mon, 18 Sep 2017 20:52:03 -0400 Received: from mail-qk0-f195.google.com ([209.85.220.195]:37283 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750714AbdISAvr (ORCPT ); Mon, 18 Sep 2017 20:51:47 -0400 X-Google-Smtp-Source: AOwi7QD/Qctq4ku0u5XsDDWN7bhmBDnb45U0wEt9Jr7ZrvsVRHKivlJtw9pvr9GtSQKP3oZixxO0gQ== From: Florian Fainelli To: alexander.levin@verizon.com Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, johan@kernel.org, jesse@kernel.org, Florian Fainelli Subject: [PATCH stable 4.1 2/2] ipv6: Remove sit_gro_receive() Date: Mon, 18 Sep 2017 17:51:37 -0700 Message-Id: <20170919005137.31773-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170919005137.31773-1-f.fainelli@gmail.com> References: <20170919005137.31773-1-f.fainelli@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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