From patchwork Fri Jan 20 13:53:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Sitnicki X-Patchwork-Id: 717693 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3v4hxR24yfz9rvt for ; Sat, 21 Jan 2017 00:53:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752252AbdATNxM (ORCPT ); Fri, 20 Jan 2017 08:53:12 -0500 Received: from mail-wm0-f45.google.com ([74.125.82.45]:36891 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752214AbdATNxK (ORCPT ); Fri, 20 Jan 2017 08:53:10 -0500 Received: by mail-wm0-f45.google.com with SMTP id c206so44529167wme.0 for ; Fri, 20 Jan 2017 05:53:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=fvIVVZyWEjuI/jxS/ja8NWox/xJJ7zEX0usyezTMQkk=; b=uoJs6h8vptuKykhWXH71BzkTtsGK2nzeyF6nQ71z9y4Yde31USaNeI+4jGYKcQjuWf kZ59fLSr+p/t9lSMTQjd0j6qJQNuLMToALuZ+91Y7pVwhPbNzwRnTrT6ufeNTo5l2weM IYspm299qLszugoGnv81HyMIIG8r4c6pzamuBw3cxLEwEtCmZYzmKvnLGbhhd+zuPdUc 892NL+aO2DhG8Ra4XuuSmRGX4EHZBfb+Oy/+WBI4+pOWx8+L1tcEOmUbpDoCKSFMZkfT EDnlL5hLM4u4Wj3g/fzJDJ9Gef3hG4EIkgKHXqZX+CK9Y6Kqb3zYpELba1aqhCjwz+6b cvAw== X-Gm-Message-State: AIkVDXJdeLZROXL1qho3b3Bn75xlaS1XdxmO2SX6MmWD/Zf3NCkddijGkMndrX4T8PAf1P6D X-Received: by 10.28.1.216 with SMTP id 207mr3770117wmb.7.1484920388966; Fri, 20 Jan 2017 05:53:08 -0800 (PST) Received: from redhat.com (89-73-147-170.dynamic.chello.pl. [89.73.147.170]) by smtp.gmail.com with ESMTPSA id c9sm6245603wmi.16.2017.01.20.05.53.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Jan 2017 05:53:07 -0800 (PST) From: Jakub Sitnicki To: David Miller Cc: netdev@vger.kernel.org Subject: [PATCH net-next] gre6: Clean up unused struct ipv6_tel_txoption definition Date: Fri, 20 Jan 2017 14:53:06 +0100 Message-Id: <1484920386-9058-1-git-send-email-jkbs@redhat.com> X-Mailer: git-send-email 2.7.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit b05229f44228 ("gre6: Cleanup GREv6 transmit path, call common GRE functions") removed the ip6gre specific transmit function, but left the struct ipv6_tel_txoption definition. Clean it up. Signed-off-by: Jakub Sitnicki --- net/ipv6/ip6_gre.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 75b6108..65bdfd1 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -484,11 +484,6 @@ static int gre_rcv(struct sk_buff *skb) return 0; } -struct ipv6_tel_txoption { - struct ipv6_txoptions ops; - __u8 dst_opt[8]; -}; - static int gre_handle_offloads(struct sk_buff *skb, bool csum) { return iptunnel_handle_offloads(skb,