Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/851557/?format=api
{ "id": 851557, "url": "http://patchwork.ozlabs.org/api/patches/851557/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/20171220170607.41516-8-lorenzo@google.com/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/projects/7/?format=api", "name": "Linux network development", "link_name": "netdev", "list_id": "netdev.vger.kernel.org", "list_email": "netdev@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20171220170607.41516-8-lorenzo@google.com>", "list_archive_url": null, "date": "2017-12-20T17:06:07", "name": "[ipsec-next,7/7] net: xfrm: Don't pass tunnel objects to xfrm6_rcv_spi.", "commit_ref": null, "pull_url": null, "state": "awaiting-upstream", "archived": true, "hash": "98919bd7c656a4cdbf3fe5d8322974caa25d9d53", "submitter": { "id": 3403, "url": "http://patchwork.ozlabs.org/api/people/3403/?format=api", "name": "Lorenzo Colitti", "email": "lorenzo@google.com" }, "delegate": { "id": 34, "url": "http://patchwork.ozlabs.org/api/users/34/?format=api", "username": "davem", "first_name": "David", "last_name": "Miller", "email": "davem@davemloft.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/20171220170607.41516-8-lorenzo@google.com/mbox/", "series": [ { "id": 19695, "url": "http://patchwork.ozlabs.org/api/series/19695/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=19695", "date": "2017-12-20T17:06:00", "name": ": Support multiple VTIs with the same src+dst pair", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/19695/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/851557/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/851557/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netdev-owner@vger.kernel.org>", "X-Original-To": "patchwork-incoming@ozlabs.org", "Delivered-To": "patchwork-incoming@ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=google.com header.i=@google.com\n\theader.b=\"dYDfwG/z\"; dkim-atps=neutral" ], "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3z21Qp2CF9z9sBd\n\tfor <patchwork-incoming@ozlabs.org>;\n\tThu, 21 Dec 2017 04:06:58 +1100 (AEDT)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1755778AbdLTRG4 (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tWed, 20 Dec 2017 12:06:56 -0500", "from mail-pf0-f196.google.com ([209.85.192.196]:43074 \"EHLO\n\tmail-pf0-f196.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1755712AbdLTRGm (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Wed, 20 Dec 2017 12:06:42 -0500", "by mail-pf0-f196.google.com with SMTP id e3so12799866pfi.10\n\tfor <netdev@vger.kernel.org>; Wed, 20 Dec 2017 09:06:42 -0800 (PST)", "from lorenzo.tok.corp.google.com ([100.103.3.232])\n\tby smtp.gmail.com with ESMTPSA id\n\tt62sm29103067pgt.23.2017.12.20.09.06.39\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 20 Dec 2017 09:06:40 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=google.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=C6Z4p0vckqoS2hXDyq3YAJkSF0Esspb6jfj88l+6kus=;\n\tb=dYDfwG/zCfjMu1089KOe449EvL3wnMda/81JWIH0uySLqCIeGvUeFKHX+Sm+PjsojY\n\tGnH5WuZF25WvxT54zfHQbWr3CkszwlNLBlgm43Qrbdg2Lwy/4TPNVuOGL8ykET/IKXht\n\t2WcEMP6n1HsIRJ3SQUxxjGGcwcjc/UxqccoXTkhtD8HNEl1Hp7HWV0NQvTLZQgXi8mVD\n\t1KG1qh1T1EyMzWo9901mHs7ai0KA03hf/cfiJGot1Z4f2dmS4T9Iiz5EsQ8uqIgre4BK\n\t2M01G+iivmpQq1wy/XxNduLGRMSHsrKtgWEi6usj3pvnzBLczS1zeIwRbn9LPegA4Wmj\n\tabdQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=C6Z4p0vckqoS2hXDyq3YAJkSF0Esspb6jfj88l+6kus=;\n\tb=AUT6PIiwRvMp4eLJ/EQYOWqJif1rd64e5B2Tbab9K8Oli/f3fSsS/3145eg+badxE3\n\t7mMSf74hxRfg1fW1WeljZHb3d+uo4iofYiRi2xhcC0dJuJj/7g4605xoWViqEapAaajO\n\txkwyh2Fer7iPXpgTwecJshqZypfZcQqELFoLsIz8mddlN5J9wFTk63Z2K/IMbROcGhwt\n\tZQe4NlR4BGJ3xvbvhuvbc9SUz/0qxL+ckqGqOnS9CQEUK5OTJS20pVfsI6hHG8EvUGJA\n\t+DR4IsrWY7HsXY6zcsnvbDH2YV2o1B7DB6eB7iypdwb5QD1ysiZvVwvOoyEkMwDV57aT\n\tU9Kw==", "X-Gm-Message-State": "AKGB3mIFz3lRrpGek+5CfCAEzUU98XVhoCswXINSneXnUdtiVpfqMtfs\n\t7Ou+2F82AvnsaSscktCysowjQ4tt64s=", "X-Google-Smtp-Source": "ACJfBoso5oQWBCicfNl35HfNCz14E+P/Jc2fZzcQ3hpgqyfxR64sy8lYxl1osLOnILfAkc7BrCD9Vg==", "X-Received": "by 10.98.103.156 with SMTP id t28mr7530044pfj.234.1513789601243; \n\tWed, 20 Dec 2017 09:06:41 -0800 (PST)", "From": "Lorenzo Colitti <lorenzo@google.com>", "To": "netdev@vger.kernel.org", "Cc": "steffen.klassert@secunet.com, subashab@codeaurora.org,\n\tnharold@google.com, davem@davemloft.net,\n\tLorenzo Colitti <lorenzo@google.com>", "Subject": "[PATCH ipsec-next 7/7] net: xfrm: Don't pass tunnel objects to\n\txfrm6_rcv_spi.", "Date": "Thu, 21 Dec 2017 02:06:07 +0900", "Message-Id": "<20171220170607.41516-8-lorenzo@google.com>", "X-Mailer": "git-send-email 2.15.1.620.gb9897f4670-goog", "In-Reply-To": "<20171220170607.41516-1-lorenzo@google.com>", "References": "<20171220170607.41516-1-lorenzo@google.com>", "Sender": "netdev-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "This change removes the tunnel parameter from xfrm6_rcv_spi and\ndeletes xfrm6_rcv_tnl. These were only used by the VTI code and\nare now unused.\n\nTested: https://android-review.googlesource.com/571524\nSigned-off-by: Lorenzo Colitti <lorenzo@google.com>\n---\n include/net/xfrm.h | 4 +---\n net/ipv6/ip6_vti.c | 2 +-\n net/ipv6/xfrm6_input.c | 13 +++----------\n net/ipv6/xfrm6_tunnel.c | 2 +-\n 4 files changed, 6 insertions(+), 15 deletions(-)", "diff": "diff --git a/include/net/xfrm.h b/include/net/xfrm.h\nindex 3d245f2f6f..fc19dda73c 100644\n--- a/include/net/xfrm.h\n+++ b/include/net/xfrm.h\n@@ -1638,10 +1638,8 @@ int xfrm4_tunnel_deregister(struct xfrm_tunnel *handler, unsigned short family);\n void xfrm4_local_error(struct sk_buff *skb, u32 mtu);\n int xfrm6_extract_header(struct sk_buff *skb);\n int xfrm6_extract_input(struct xfrm_state *x, struct sk_buff *skb);\n-int xfrm6_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi,\n-\t\t struct ip6_tnl *t);\n+int xfrm6_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi);\n int xfrm6_transport_finish(struct sk_buff *skb, int async);\n-int xfrm6_rcv_tnl(struct sk_buff *skb, struct ip6_tnl *t);\n int xfrm6_rcv(struct sk_buff *skb);\n int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr,\n \t\t xfrm_address_t *saddr, u8 proto);\ndiff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c\nindex 18c2695dc3..2ac0bfff0f 100644\n--- a/net/ipv6/ip6_vti.c\n+++ b/net/ipv6/ip6_vti.c\n@@ -401,7 +401,7 @@ static int vti6_rcv(struct sk_buff *skb)\n \tint nexthdr = skb_network_header(skb)[IP6CB(skb)->nhoff];\n \n \tXFRM_TUNNEL_SKB_CB(skb)->tunnel.lookup = vti6_lookup;\n-\treturn xfrm6_rcv_spi(skb, nexthdr, 0, NULL);\n+\treturn xfrm6_rcv_spi(skb, nexthdr, 0);\n }\n \n static int vti6_rcv_cb(struct sk_buff *skb, int err)\ndiff --git a/net/ipv6/xfrm6_input.c b/net/ipv6/xfrm6_input.c\nindex 6d1b734fef..5f20e30926 100644\n--- a/net/ipv6/xfrm6_input.c\n+++ b/net/ipv6/xfrm6_input.c\n@@ -22,8 +22,7 @@ int xfrm6_extract_input(struct xfrm_state *x, struct sk_buff *skb)\n \treturn xfrm6_extract_header(skb);\n }\n \n-int xfrm6_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi,\n-\t\t struct ip6_tnl *t)\n+int xfrm6_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi)\n {\n \tXFRM_SPI_SKB_CB(skb)->family = AF_INET6;\n \tXFRM_SPI_SKB_CB(skb)->daddroff = offsetof(struct ipv6hdr, daddr);\n@@ -59,16 +58,10 @@ int xfrm6_transport_finish(struct sk_buff *skb, int async)\n \treturn -1;\n }\n \n-int xfrm6_rcv_tnl(struct sk_buff *skb, struct ip6_tnl *t)\n-{\n-\treturn xfrm6_rcv_spi(skb, skb_network_header(skb)[IP6CB(skb)->nhoff],\n-\t\t\t 0, t);\n-}\n-EXPORT_SYMBOL(xfrm6_rcv_tnl);\n-\n int xfrm6_rcv(struct sk_buff *skb)\n {\n-\treturn xfrm6_rcv_tnl(skb, NULL);\n+\treturn xfrm6_rcv_spi(skb, skb_network_header(skb)[IP6CB(skb)->nhoff],\n+\t\t\t 0);\n }\n EXPORT_SYMBOL(xfrm6_rcv);\n int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr,\ndiff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c\nindex f85f0d7480..02161543a9 100644\n--- a/net/ipv6/xfrm6_tunnel.c\n+++ b/net/ipv6/xfrm6_tunnel.c\n@@ -236,7 +236,7 @@ static int xfrm6_tunnel_rcv(struct sk_buff *skb)\n \t__be32 spi;\n \n \tspi = xfrm6_tunnel_spi_lookup(net, (const xfrm_address_t *)&iph->saddr);\n-\treturn xfrm6_rcv_spi(skb, IPPROTO_IPV6, spi, NULL);\n+\treturn xfrm6_rcv_spi(skb, IPPROTO_IPV6, spi);\n }\n \n static int xfrm6_tunnel_err(struct sk_buff *skb, struct inet6_skb_parm *opt,\n", "prefixes": [ "ipsec-next", "7/7" ] }