{"id":833718,"url":"http://patchwork.ozlabs.org/api/1.2/patches/833718/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171103090344.19444-4-jiri@resnulli.us/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/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":"<20171103090344.19444-4-jiri@resnulli.us>","list_archive_url":null,"date":"2017-11-03T09:03:31","name":"[net-next,03/16] mlxsw: spectrum: Move mlxsw_sp_ipip_netdev_{s,d}addr{,4}()","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"e12545d83e94c0bac7a7bafe19809fed4d5e2191","submitter":{"id":15321,"url":"http://patchwork.ozlabs.org/api/1.2/people/15321/?format=json","name":"Jiri Pirko","email":"jiri@resnulli.us"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20171103090344.19444-4-jiri@resnulli.us/mbox/","series":[{"id":11677,"url":"http://patchwork.ozlabs.org/api/1.2/series/11677/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=11677","date":"2017-11-03T09:03:28","name":"mlxsw: Handle changes in GRE configuration","version":1,"mbox":"http://patchwork.ozlabs.org/series/11677/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/833718/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/833718/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=resnulli-us.20150623.gappssmtp.com\n\theader.i=@resnulli-us.20150623.gappssmtp.com\n\theader.b=\"YUzp2k8p\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3ySwx574VNz9sNV\n\tfor ;\n\tFri, 3 Nov 2017 20:03:53 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932550AbdKCJDw (ORCPT );\n\tFri, 3 Nov 2017 05:03:52 -0400","from mail-wr0-f195.google.com ([209.85.128.195]:52493 \"EHLO\n\tmail-wr0-f195.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1754253AbdKCJDs (ORCPT\n\t); Fri, 3 Nov 2017 05:03:48 -0400","by mail-wr0-f195.google.com with SMTP id k62so1863649wrc.9\n\tfor ; Fri, 03 Nov 2017 02:03:48 -0700 (PDT)","from localhost (ip-94-113-127-32.net.upcbroadband.cz.\n\t[94.113.127.32]) by smtp.gmail.com with ESMTPSA id\n\t138sm1983182wmf.21.2017.11.03.02.03.47\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tFri, 03 Nov 2017 02:03:47 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=resnulli-us.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=E687065f6UHayfBYXlV+aQ51ZcGbvL3nJs8KO4+zTnI=;\n\tb=YUzp2k8puGmk2Jf3+xNzjfp5B10Jbm8ub0G602//PG7sX9dDwffXud39mJqTjSxQQb\n\tiIa8jP0AelA2d88JGVfG8UD5zqcHr/gZ6hmw6DZA4n7iGgvorlFmIhx8/VcIu9G2phQt\n\tJ82chSa2CN8mwwNkggIBMNy4XngK0/aza/3WpcRgJn3X+fHKL9dFNXv7FJZfKDCxQr4+\n\tmUoKCpq2ZGvn02CYHDTC6SItGGPdc8LyLKmvF2aRbyCfh6vnifm/5A4aK7HDrrDbjV6a\n\tHbu/sh+8K/e/nn6SD28uweT133Y3WhgUbkBAb7x9rA2jbv+14f+d+d043lWmnsyrHTfp\n\thUaw==","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=E687065f6UHayfBYXlV+aQ51ZcGbvL3nJs8KO4+zTnI=;\n\tb=mrugjCnWH6ywBdhnFDSBWfDL13Hy7vS0zzdnVFE8n51eOUNVGTaN4sxiS/6cGyKjwG\n\tZPtfdNi7l98bgKDkaAj0DxYE9h6HJOWm5fZ6fHpRmC6RpIxDnqQAdmZCoDAm4hAs27WZ\n\tnixRu+VfNP0fDgCNTptyBdIVF+CCHi+7cqyYGi4SjHu8b1lX3rnG2bC4gRUsi2Zp5IcS\n\tkfcOQ9tUfV++reUymrI6M23tIG0Vr+NcbP713jF7Fv6FeD90xFntdA/7oK3rwTE4N9eq\n\tRC5Hu+VbhEzNrAB+zoG2owBKgFfEp8IGw+MwvV8xp0eIa1EHOBmzCG0TDY1jiSLl5PvK\n\tmDRg==","X-Gm-Message-State":"AMCzsaVhcSCZVtk2DHm3mQzAgJpf4IDR1PqyUIcUPBxR9ykbPtiETR/I\n\tur3tM/dAzxkqljB/oaTaF1uGWsaT","X-Google-Smtp-Source":"ABhQp+RaIH5p7IvsI+TKso6pR3FPaUOcQPUBm5Gkd/EfI2lIfiaS1Vs/vh1h65efn/+kiFmwbykRfA==","X-Received":"by 10.223.199.138 with SMTP id l10mr4945728wrg.121.1509699827508;\n\tFri, 03 Nov 2017 02:03:47 -0700 (PDT)","From":"Jiri Pirko ","To":"netdev@vger.kernel.org","Cc":"davem@davemloft.net, petrm@mellanox.com, idosch@mellanox.com,\n\tmlxsw@mellanox.com","Subject":"[patch net-next 03/16] mlxsw: spectrum: Move\n\tmlxsw_sp_ipip_netdev_{s, d}addr{, 4}()","Date":"Fri, 3 Nov 2017 10:03:31 +0100","Message-Id":"<20171103090344.19444-4-jiri@resnulli.us>","X-Mailer":"git-send-email 2.9.5","In-Reply-To":"<20171103090344.19444-1-jiri@resnulli.us>","References":"<20171103090344.19444-1-jiri@resnulli.us>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Petr Machata \n\nThese functions ideologically belong to the IPIP module, and some\nfollow-up work will benefit from their presence there.\n\nSigned-off-by: Petr Machata \nReviewed-by: Ido Schimmel \nSigned-off-by: Jiri Pirko \n---\n .../net/ethernet/mellanox/mlxsw/spectrum_ipip.c | 53 ++++++++++++++++++++++\n .../net/ethernet/mellanox/mlxsw/spectrum_ipip.h | 4 ++\n .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 53 ----------------------\n .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 7 ---\n 4 files changed, 57 insertions(+), 60 deletions(-)","diff":"diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c\nindex 702fe94..8a9fbb6 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c\n@@ -68,6 +68,59 @@ static u32 mlxsw_sp_ipip_netdev_okey(const struct net_device *ol_dev)\n \t\tbe32_to_cpu(tun->parms.o_key) : 0;\n }\n \n+static __be32\n+mlxsw_sp_ipip_netdev_saddr4(const struct net_device *ol_dev)\n+{\n+\tstruct ip_tunnel *tun = netdev_priv(ol_dev);\n+\n+\treturn tun->parms.iph.saddr;\n+}\n+\n+union mlxsw_sp_l3addr\n+mlxsw_sp_ipip_netdev_saddr(enum mlxsw_sp_l3proto proto,\n+\t\t\t const struct net_device *ol_dev)\n+{\n+\tswitch (proto) {\n+\tcase MLXSW_SP_L3_PROTO_IPV4:\n+\t\treturn (union mlxsw_sp_l3addr) {\n+\t\t\t.addr4 = mlxsw_sp_ipip_netdev_saddr4(ol_dev),\n+\t\t};\n+\tcase MLXSW_SP_L3_PROTO_IPV6:\n+\t\tbreak;\n+\t}\n+\n+\tWARN_ON(1);\n+\treturn (union mlxsw_sp_l3addr) {\n+\t\t.addr4 = 0,\n+\t};\n+}\n+\n+static __be32 mlxsw_sp_ipip_netdev_daddr4(const struct net_device *ol_dev)\n+{\n+\tstruct ip_tunnel *tun = netdev_priv(ol_dev);\n+\n+\treturn tun->parms.iph.daddr;\n+}\n+\n+static union mlxsw_sp_l3addr\n+mlxsw_sp_ipip_netdev_daddr(enum mlxsw_sp_l3proto proto,\n+\t\t\t const struct net_device *ol_dev)\n+{\n+\tswitch (proto) {\n+\tcase MLXSW_SP_L3_PROTO_IPV4:\n+\t\treturn (union mlxsw_sp_l3addr) {\n+\t\t\t.addr4 = mlxsw_sp_ipip_netdev_daddr4(ol_dev),\n+\t\t};\n+\tcase MLXSW_SP_L3_PROTO_IPV6:\n+\t\tbreak;\n+\t}\n+\n+\tWARN_ON(1);\n+\treturn (union mlxsw_sp_l3addr) {\n+\t\t.addr4 = 0,\n+\t};\n+}\n+\n static int\n mlxsw_sp_ipip_nexthop_update_gre4(struct mlxsw_sp *mlxsw_sp, u32 adj_index,\n \t\t\t\t struct mlxsw_sp_ipip_entry *ipip_entry)\ndiff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.h\nindex 6fb4912..87becd1 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.h\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.h\n@@ -38,6 +38,10 @@\n #include \"spectrum_router.h\"\n #include \n \n+union mlxsw_sp_l3addr\n+mlxsw_sp_ipip_netdev_saddr(enum mlxsw_sp_l3proto proto,\n+\t\t\t const struct net_device *ol_dev);\n+\n enum mlxsw_sp_ipip_type {\n \tMLXSW_SP_IPIP_TYPE_GRE4,\n \tMLXSW_SP_IPIP_TYPE_MAX,\ndiff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\nindex 97f062a..ec90c6b 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\n@@ -1016,59 +1016,6 @@ mlxsw_sp_ipip_entry_dealloc(struct mlxsw_sp_ipip_entry *ipip_entry)\n \tkfree(ipip_entry);\n }\n \n-static __be32\n-mlxsw_sp_ipip_netdev_saddr4(const struct net_device *ol_dev)\n-{\n-\tstruct ip_tunnel *tun = netdev_priv(ol_dev);\n-\n-\treturn tun->parms.iph.saddr;\n-}\n-\n-union mlxsw_sp_l3addr\n-mlxsw_sp_ipip_netdev_saddr(enum mlxsw_sp_l3proto proto,\n-\t\t\t const struct net_device *ol_dev)\n-{\n-\tswitch (proto) {\n-\tcase MLXSW_SP_L3_PROTO_IPV4:\n-\t\treturn (union mlxsw_sp_l3addr) {\n-\t\t\t.addr4 = mlxsw_sp_ipip_netdev_saddr4(ol_dev),\n-\t\t};\n-\tcase MLXSW_SP_L3_PROTO_IPV6:\n-\t\tbreak;\n-\t};\n-\n-\tWARN_ON(1);\n-\treturn (union mlxsw_sp_l3addr) {\n-\t\t.addr4 = 0,\n-\t};\n-}\n-\n-__be32 mlxsw_sp_ipip_netdev_daddr4(const struct net_device *ol_dev)\n-{\n-\tstruct ip_tunnel *tun = netdev_priv(ol_dev);\n-\n-\treturn tun->parms.iph.daddr;\n-}\n-\n-union mlxsw_sp_l3addr\n-mlxsw_sp_ipip_netdev_daddr(enum mlxsw_sp_l3proto proto,\n-\t\t\t const struct net_device *ol_dev)\n-{\n-\tswitch (proto) {\n-\tcase MLXSW_SP_L3_PROTO_IPV4:\n-\t\treturn (union mlxsw_sp_l3addr) {\n-\t\t\t.addr4 = mlxsw_sp_ipip_netdev_daddr4(ol_dev),\n-\t\t};\n-\tcase MLXSW_SP_L3_PROTO_IPV6:\n-\t\tbreak;\n-\t};\n-\n-\tWARN_ON(1);\n-\treturn (union mlxsw_sp_l3addr) {\n-\t\t.addr4 = 0,\n-\t};\n-}\n-\n static bool mlxsw_sp_l3addr_eq(const union mlxsw_sp_l3addr *addr1,\n \t\t\t const union mlxsw_sp_l3addr *addr2)\n {\ndiff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h\nindex 39e5811..8120b01 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h\n@@ -103,13 +103,6 @@ mlxsw_sp_neigh_entry_counter_update(struct mlxsw_sp *mlxsw_sp,\n \t\t\t\t struct mlxsw_sp_neigh_entry *neigh_entry,\n \t\t\t\t bool adding);\n bool mlxsw_sp_neigh_ipv6_ignore(struct mlxsw_sp_neigh_entry *neigh_entry);\n-union mlxsw_sp_l3addr\n-mlxsw_sp_ipip_netdev_saddr(enum mlxsw_sp_l3proto proto,\n-\t\t\t const struct net_device *ol_dev);\n-union mlxsw_sp_l3addr\n-mlxsw_sp_ipip_netdev_daddr(enum mlxsw_sp_l3proto proto,\n-\t\t\t const struct net_device *ol_dev);\n-__be32 mlxsw_sp_ipip_netdev_daddr4(const struct net_device *ol_dev);\n struct mlxsw_sp_nexthop *mlxsw_sp_nexthop_next(struct mlxsw_sp_router *router,\n \t\t\t\t\t struct mlxsw_sp_nexthop *nh);\n bool mlxsw_sp_nexthop_offload(struct mlxsw_sp_nexthop *nh);\n","prefixes":["net-next","03/16"]}