netfilter: nft_tunnel: fix sparse errors
authorPablo Neira Ayuso <pablo@netfilter.org>
Fri, 3 Aug 2018 22:31:48 +0000 (00:31 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Fri, 3 Aug 2018 22:53:29 +0000 (00:53 +0200)
[...]
net/netfilter/nft_tunnel.c:117:25:    expected unsigned int [unsigned] [usertype] flags
net/netfilter/nft_tunnel.c:117:25:    got restricted __be16 [usertype] <noident>
[...]
net/netfilter/nft_tunnel.c:246:33:    expected restricted __be16 [addressable] [assigned] [usertype] tp_dst
net/netfilter/nft_tunnel.c:246:33:    got int

Fixes: af308b94a2a4 ("netfilter: nf_tables: add tunnel support")
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/nft_tunnel.c

index 9332d79..3a15f21 100644 (file)
@@ -116,7 +116,7 @@ struct nft_tunnel_opts {
                struct erspan_metadata  erspan;
        } u;
        u32     len;
-       u32     flags;
+       __be16  flags;
 };
 
 struct nft_tunnel_obj {
@@ -337,12 +337,10 @@ static int nft_tunnel_obj_init(const struct nft_ctx *ctx,
        }
 
        if (tb[NFTA_TUNNEL_KEY_SPORT]) {
-               info.key.tp_src =
-                       ntohs(nla_get_be16(tb[NFTA_TUNNEL_KEY_SPORT]));
+               info.key.tp_src = nla_get_be16(tb[NFTA_TUNNEL_KEY_SPORT]);
        }
        if (tb[NFTA_TUNNEL_KEY_DPORT]) {
-               info.key.tp_dst =
-                       ntohs(nla_get_be16(tb[NFTA_TUNNEL_KEY_DPORT]));
+               info.key.tp_dst = nla_get_be16(tb[NFTA_TUNNEL_KEY_DPORT]);
        }
 
        if (tb[NFTA_TUNNEL_KEY_FLAGS]) {