]> err.no Git - linux-2.6/commitdiff
[NETFILTER]: nfnetlink_log: fix byteorder confusion
authorPatrick McHardy <kaber@trash.net>
Fri, 19 May 2006 09:17:18 +0000 (02:17 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 19 May 2006 09:17:18 +0000 (02:17 -0700)
flags is a u16, so use htons instead of htonl. Also avoid double
conversion.

Noticed by Alexey Dobriyan <adobriyan@gmail.com>

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/netfilter/nfnetlink_log.c

index c60273cad778ed1c3cdc7eda166aafc6b21d9802..61cdda4e5d3ba8b25f02af19a7bbb634fc9a0d84 100644 (file)
@@ -321,7 +321,7 @@ static int
 nfulnl_set_flags(struct nfulnl_instance *inst, u_int16_t flags)
 {
        spin_lock_bh(&inst->lock);
-       inst->flags = ntohs(flags);
+       inst->flags = flags;
        spin_unlock_bh(&inst->lock);
 
        return 0;
@@ -902,7 +902,7 @@ nfulnl_recv_config(struct sock *ctnl, struct sk_buff *skb,
        if (nfula[NFULA_CFG_FLAGS-1]) {
                u_int16_t flags =
                        *(u_int16_t *)NFA_DATA(nfula[NFULA_CFG_FLAGS-1]);
-               nfulnl_set_flags(inst, ntohl(flags));
+               nfulnl_set_flags(inst, ntohs(flags));
        }
 
 out_put: