From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 03/17] netfilter: nft_tunnel: no need to call htons() when dumping ports
Date: Mon, 30 Dec 2019 12:21:29 +0100 [thread overview]
Message-ID: <20191230112143.121708-4-pablo@netfilter.org> (raw)
In-Reply-To: <20191230112143.121708-1-pablo@netfilter.org>
From: Xin Long <lucien.xin@gmail.com>
info->key.tp_src and tp_dst are __be16, when using nla_put_be16()
to dump them, htons() is not needed, so remove it in this patch.
Fixes: af308b94a2a4 ("netfilter: nf_tables: add tunnel support")
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/nft_tunnel.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/netfilter/nft_tunnel.c b/net/netfilter/nft_tunnel.c
index 3d4c2ae605a8..ef2065dd4f8a 100644
--- a/net/netfilter/nft_tunnel.c
+++ b/net/netfilter/nft_tunnel.c
@@ -501,8 +501,8 @@ static int nft_tunnel_opts_dump(struct sk_buff *skb,
static int nft_tunnel_ports_dump(struct sk_buff *skb,
struct ip_tunnel_info *info)
{
- if (nla_put_be16(skb, NFTA_TUNNEL_KEY_SPORT, htons(info->key.tp_src)) < 0 ||
- nla_put_be16(skb, NFTA_TUNNEL_KEY_DPORT, htons(info->key.tp_dst)) < 0)
+ if (nla_put_be16(skb, NFTA_TUNNEL_KEY_SPORT, info->key.tp_src) < 0 ||
+ nla_put_be16(skb, NFTA_TUNNEL_KEY_DPORT, info->key.tp_dst) < 0)
return -1;
return 0;
--
2.11.0
next prev parent reply other threads:[~2019-12-30 11:21 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-30 11:21 [PATCH 00/17] Netfilter updates for net-next Pablo Neira Ayuso
2019-12-30 11:21 ` [PATCH 01/17] netfilter: Clean up unnecessary #ifdef Pablo Neira Ayuso
2019-12-30 11:21 ` [PATCH 02/17] netfilter: Document ingress hook Pablo Neira Ayuso
2019-12-30 11:21 ` Pablo Neira Ayuso [this message]
2019-12-30 11:21 ` [PATCH 04/17] netfilter: nft_tunnel: add the missing ERSPAN_VERSION nla_policy Pablo Neira Ayuso
2019-12-30 11:21 ` [PATCH 05/17] netfilter: nft_tunnel: also dump ERSPAN_VERSION Pablo Neira Ayuso
2019-12-30 11:21 ` [PATCH 06/17] netfilter: nft_tunnel: also dump OPTS_ERSPAN/VXLAN Pablo Neira Ayuso
2019-12-30 11:21 ` [PATCH 07/17] netfilter: nft_tunnel: add the missing nla_nest_cancel() Pablo Neira Ayuso
2019-12-30 11:21 ` [PATCH 08/17] netfilter: conntrack: remove two export symbols Pablo Neira Ayuso
2019-12-30 11:21 ` [PATCH 09/17] netfilter: nft_meta: move time handling to helper Pablo Neira Ayuso
2019-12-30 11:21 ` [PATCH 10/17] netfilter: nft_meta: move pkttype " Pablo Neira Ayuso
2019-12-30 11:21 ` [PATCH 11/17] netfilter: nft_meta: move sk uid/git " Pablo Neira Ayuso
2019-12-30 11:21 ` [PATCH 12/17] netfilter: nft_meta: move cgroup " Pablo Neira Ayuso
2019-12-30 11:21 ` [PATCH 13/17] netfilter: nft_meta: move interface kind " Pablo Neira Ayuso
2019-12-30 11:21 ` [PATCH 14/17] netfilter: nft_meta: move all interface related keys " Pablo Neira Ayuso
2019-12-30 11:21 ` [PATCH 15/17] netfilter: nft_meta: place prandom handling in a helper Pablo Neira Ayuso
2019-12-30 11:21 ` [PATCH 16/17] netfilter: nft_meta: place rtclassid " Pablo Neira Ayuso
2019-12-30 11:21 ` [PATCH 17/17] netfilter: nft_meta: add support for slave device ifindex matching Pablo Neira Ayuso
2019-12-30 22:29 ` [PATCH 00/17] Netfilter updates for net-next David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191230112143.121708-4-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).