From patchwork Fri Sep 18 19:59:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "John W. Linville" X-Patchwork-Id: 519568 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 B22D7140787 for ; Sat, 19 Sep 2015 06:00:23 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753508AbbIRUAT (ORCPT ); Fri, 18 Sep 2015 16:00:19 -0400 Received: from charlotte.tuxdriver.com ([70.61.120.58]:47063 "EHLO smtp.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753134AbbIRUAS (ORCPT ); Fri, 18 Sep 2015 16:00:18 -0400 Received: from uucp by smtp.tuxdriver.com with local-rmail (Exim 4.63) (envelope-from ) id 1Zd1pJ-0007GP-If; Fri, 18 Sep 2015 16:00:09 -0400 Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by localhost.localdomain (8.15.2/8.14.6) with ESMTP id t8IJxCLA011212; Fri, 18 Sep 2015 15:59:12 -0400 Received: (from linville@localhost) by localhost.localdomain (8.15.2/8.15.2/Submit) id t8IJxCg9011211; Fri, 18 Sep 2015 15:59:12 -0400 From: "John W. Linville" To: netdev@vger.kernel.org Cc: davem@davemloft.net, Pravin B Shelar , Eric Dumazet , Jesse Gross , Stephen Hemminger , "John W. Linville" Subject: [PATCH] geneve: use network byte order for destination port config parameter Date: Fri, 18 Sep 2015 15:59:10 -0400 Message-Id: <1442606350-11170-1-git-send-email-linville@tuxdriver.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1442518065-23294-1-git-send-email-linville@tuxdriver.com> References: <1442518065-23294-1-git-send-email-linville@tuxdriver.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This is primarily for consistancy with vxlan and other tunnels which use network byte order for similar parameters. Signed-off-by: John W. Linville Reviewed-by: Jesse Gross --- It is OK to change this, since this parameter was introduced to net-next in the pre-4.3 cycle. Using network byte order for this parameter is consistent with what the other tunnels are doing. drivers/net/geneve.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index 50f551a69dcb..34cfeacba149 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -1049,7 +1049,7 @@ static struct geneve_dev *geneve_find_dev(struct geneve_net *gn, static int geneve_configure(struct net *net, struct net_device *dev, union geneve_addr *remote, - __u32 vni, __u8 ttl, __u8 tos, __u16 dst_port, + __u32 vni, __u8 ttl, __u8 tos, __be16 dst_port, bool metadata) { struct geneve_net *gn = net_generic(net, geneve_net_id); @@ -1083,10 +1083,10 @@ static int geneve_configure(struct net *net, struct net_device *dev, geneve->ttl = ttl; geneve->tos = tos; - geneve->dst_port = htons(dst_port); + geneve->dst_port = dst_port; geneve->collect_md = metadata; - t = geneve_find_dev(gn, htons(dst_port), remote, geneve->vni, + t = geneve_find_dev(gn, dst_port, remote, geneve->vni, &tun_on_same_port, &tun_collect_md); if (t) return -EBUSY; @@ -1110,7 +1110,7 @@ static int geneve_configure(struct net *net, struct net_device *dev, static int geneve_newlink(struct net *net, struct net_device *dev, struct nlattr *tb[], struct nlattr *data[]) { - __u16 dst_port = GENEVE_UDP_PORT; + __be16 dst_port = htons(GENEVE_UDP_PORT); __u8 ttl = 0, tos = 0; bool metadata = false; union geneve_addr remote; @@ -1144,7 +1144,7 @@ static int geneve_newlink(struct net *net, struct net_device *dev, tos = nla_get_u8(data[IFLA_GENEVE_TOS]); if (data[IFLA_GENEVE_PORT]) - dst_port = nla_get_u16(data[IFLA_GENEVE_PORT]); + dst_port = nla_get_be16(data[IFLA_GENEVE_PORT]); if (data[IFLA_GENEVE_COLLECT_METADATA]) metadata = true; @@ -1167,7 +1167,7 @@ static size_t geneve_get_size(const struct net_device *dev) nla_total_size(sizeof(struct in6_addr)) + /* IFLA_GENEVE_REMOTE{6} */ nla_total_size(sizeof(__u8)) + /* IFLA_GENEVE_TTL */ nla_total_size(sizeof(__u8)) + /* IFLA_GENEVE_TOS */ - nla_total_size(sizeof(__u16)) + /* IFLA_GENEVE_PORT */ + nla_total_size(sizeof(__be16)) + /* IFLA_GENEVE_PORT */ nla_total_size(0) + /* IFLA_GENEVE_COLLECT_METADATA */ 0; } @@ -1197,7 +1197,7 @@ static int geneve_fill_info(struct sk_buff *skb, const struct net_device *dev) nla_put_u8(skb, IFLA_GENEVE_TOS, geneve->tos)) goto nla_put_failure; - if (nla_put_u16(skb, IFLA_GENEVE_PORT, ntohs(geneve->dst_port))) + if (nla_put_be16(skb, IFLA_GENEVE_PORT, geneve->dst_port)) goto nla_put_failure; if (geneve->collect_md) { @@ -1238,7 +1238,7 @@ struct net_device *geneve_dev_create_fb(struct net *net, const char *name, return dev; err = geneve_configure(net, dev, &geneve_remote_unspec, - 0, 0, 0, dst_port, true); + 0, 0, 0, htons(dst_port), true); if (err) { free_netdev(dev); return ERR_PTR(err);