{"id":815221,"url":"http://patchwork.ozlabs.org/api/patches/815221/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170919003904.5124-11-tom@quantonium.net/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","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":"<20170919003904.5124-11-tom@quantonium.net>","list_archive_url":null,"date":"2017-09-19T00:39:00","name":"[net-next,10/14] gtp: Add support for devnet","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"16589ef58eb0acc87c13f4abba23991f0b54e593","submitter":{"id":72064,"url":"http://patchwork.ozlabs.org/api/people/72064/?format=json","name":"Tom Herbert","email":"tom@quantonium.net"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170919003904.5124-11-tom@quantonium.net/mbox/","series":[{"id":3758,"url":"http://patchwork.ozlabs.org/api/series/3758/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=3758","date":"2017-09-19T00:38:50","name":"gtp: Additional feature support","version":1,"mbox":"http://patchwork.ozlabs.org/series/3758/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815221/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815221/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=quantonium-net.20150623.gappssmtp.com\n\theader.i=@quantonium-net.20150623.gappssmtp.com\n\theader.b=\"tdHzzkyu\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xx3tS4pKGz9s5L\n\tfor ;\n\tTue, 19 Sep 2017 10:40:00 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751509AbdISAj6 (ORCPT );\n\tMon, 18 Sep 2017 20:39:58 -0400","from mail-pf0-f171.google.com ([209.85.192.171]:55703 \"EHLO\n\tmail-pf0-f171.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751480AbdISAj4 (ORCPT\n\t); Mon, 18 Sep 2017 20:39:56 -0400","by mail-pf0-f171.google.com with SMTP id r71so1099533pfe.12\n\tfor ; Mon, 18 Sep 2017 17:39:56 -0700 (PDT)","from localhost.localdomain (c-73-162-13-107.hsd1.ca.comcast.net.\n\t[73.162.13.107]) by smtp.gmail.com with ESMTPSA id\n\tk78sm662018pfb.157.2017.09.18.17.39.54\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tMon, 18 Sep 2017 17:39:54 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=quantonium-net.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=qUlmMIMEM/vtKZ0+B0GQrBrLIjMcKU+y5Ie/ZIjbBVE=;\n\tb=tdHzzkyuSw3gUiqwdknhgyWqemENAXQvPIZIAhTWlAMf1aH7zETnFDIUrv8zjPbs+S\n\tgFAIuK2NeFJtFyrdpZeYZEL3sO/IkKWaL29eH6GRdfYd4Jeo39UMO9liBQaaX8phrzkk\n\tG5RwHcqsOd/p5uRvRcWwsQjlh/eE3d+jXh28yq8VswnKVNTvmXomq7P2RqEiUhoWIX60\n\t0HCnP3D9P9TIYNBpd7eSoPiCUyl9wXRNflwv1s/f2KynPYwn01N9vWMpTSmSiU32E3bw\n\tKICNxZUdWNpCqIG2iqJktV9gN6+UWHpCvXC5wHHt2S6ByznErZ0tiqfVVgYah1uBZHmk\n\tMjVw==","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=qUlmMIMEM/vtKZ0+B0GQrBrLIjMcKU+y5Ie/ZIjbBVE=;\n\tb=lctH1jXPOyhkaPPzMBpsGuPGgBaNHIIbkpEi6A1tAdkpGB1DXAzHMRyjGu0zJIQ42S\n\tvnyZfX2xg6P509croH9yGW2gCAqQLbtLUBMMMX7AuO/XJT2a+CnmUJoZqRM4eXdg+cU8\n\tLCImfPp8zSNYIdDPsjuZod3nljaGyMeLjFDB13dzcM7Dy5u7NixH1O9hwULBLLgHU1gd\n\tzv8gF62HrPKIJEp3AUbX3POxdofKRB7A3ShN/GJJkG1UkHbC2cJzdQT/iekvnqs7fy24\n\t8e9ZJgNK6MpJr3jNrAt4qc1paxFhojDpB2uNto4I6NGPFORrCmY71lhZzFP6wUi4b1nj\n\tdyKQ==","X-Gm-Message-State":"AHPjjUh19H7PtsBCZAYP+9P0ru1DtPHSiSEu7hrmYcB7FcFhqXylNvry\n\tjxYsCbvKga/rrD5D","X-Google-Smtp-Source":"AOwi7QC37kWjj/j88o+cFM475uMmbfrKKHACDlCRvGkFp31Bgnhe8KrX/et0/D828gc/rQQbJ8dPSQ==","X-Received":"by 10.84.235.72 with SMTP id g8mr350730plt.86.1505781595708;\n\tMon, 18 Sep 2017 17:39:55 -0700 (PDT)","From":"Tom Herbert ","To":"davem@davemloft.net","Cc":"netdev@vger.kernel.org, pablo@netfilter.org, laforge@gnumonks.org,\n\trohit@quantonium.net, Tom Herbert ","Subject":"[PATCH net-next 10/14] gtp: Add support for devnet","Date":"Mon, 18 Sep 2017 17:39:00 -0700","Message-Id":"<20170919003904.5124-11-tom@quantonium.net>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20170919003904.5124-1-tom@quantonium.net>","References":"<20170919003904.5124-1-tom@quantonium.net>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Add a net field to gtp that is derived from src_net. Use net_eq to make\ncross net argument for transmit functions.\n\nSigned-off-by: Tom Herbert \n---\n drivers/net/gtp.c | 10 +++++++---\n 1 file changed, 7 insertions(+), 3 deletions(-)","diff":"diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c\nindex 1870469a4982..393f63cb2576 100644\n--- a/drivers/net/gtp.c\n+++ b/drivers/net/gtp.c\n@@ -89,6 +89,7 @@ struct gtp_dev {\n \tstruct socket\t\t*sock0;\n \tstruct socket\t\t*sock1u;\n \n+\tstruct net\t\t*net;\n \tstruct net_device\t*dev;\n \n \tunsigned int\t\trole;\n@@ -271,6 +272,7 @@ static u16 ipver_to_eth(struct iphdr *iph)\n static int gtp_rx(struct pdp_ctx *pctx, struct sk_buff *skb,\n \t\t unsigned int hdrlen, unsigned int role)\n {\n+\tstruct gtp_dev *gtp = netdev_priv(pctx->dev);\n \tstruct pcpu_sw_netstats *stats;\n \tu16 inner_protocol;\n \n@@ -285,8 +287,7 @@ static int gtp_rx(struct pdp_ctx *pctx, struct sk_buff *skb,\n \n \t/* Get rid of the GTP + UDP headers. */\n \tif (iptunnel_pull_header(skb, hdrlen, inner_protocol,\n-\t\t\t\t !net_eq(sock_net(pctx->sk),\n-\t\t\t\t\t dev_net(pctx->dev))))\n+\t\t\t\t !net_eq(gtp->net, dev_net(pctx->dev))))\n \t\treturn -1;\n \n \tnetdev_dbg(pctx->dev, \"forwarding packet from GGSN to uplink\\n\");\n@@ -532,6 +533,8 @@ static void gtp_push_header(struct sk_buff *skb, struct pdp_ctx *pctx)\n static int gtp_xmit(struct sk_buff *skb, struct net_device *dev,\n \t\t struct pdp_ctx *pctx)\n {\n+\tstruct gtp_dev *gtp = netdev_priv(dev);\n+\tbool xnet = !net_eq(gtp->net, dev_net(gtp->dev));\n \tstruct sock *sk = pctx->sk;\n \tint err = 0;\n \n@@ -564,7 +567,7 @@ static int gtp_xmit(struct sk_buff *skb, struct net_device *dev,\n \t\t\t\t pctx->peer_addr_ip4.s_addr,\n \t\t\t\t 0, ip4_dst_hoplimit(&rt->dst), 0,\n \t\t\t\t pctx->gtp_port, pctx->gtp_port,\n-\t\t\t\t false, false);\n+\t\t\t\t xnet, false);\n \n \t\tnetdev_dbg(dev, \"gtp -> IP src: %pI4 dst: %pI4\\n\",\n \t\t\t &saddr, &pctx->peer_addr_ip4.s_addr);\n@@ -782,6 +785,7 @@ static int gtp_newlink(struct net *src_net, struct net_device *dev,\n \n \tgtp->role = role;\n \tgtp->is_ipv6 = is_ipv6;\n+\tgtp->net = src_net;\n \n \tgn = net_generic(dev_net(dev), gtp_net_id);\n \tlist_add_rcu(>p->list, &gn->gtp_dev_list);\n","prefixes":["net-next","10/14"]}