From e56bcf4bd5a574812b7b89fc8467a2c370c94097 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Fri, 19 May 2006 02:17:18 -0700
Subject: [PATCH] --- yaml --- r: 26793 b: refs/heads/master c:
 ee433530d96a7b0af24ab616e5b51f1d89f9ae38 h: refs/heads/master i:   26791:
 2163552072bf414220091b42790d0e38a4c38f80 v: v3

---
 [refs]                              | 2 +-
 trunk/net/netfilter/nfnetlink_log.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f2959aef0184..383bbeec3989 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c8ac66bb2ff89e759f0d632a27cc64205e9ddd9
+refs/heads/master: ee433530d96a7b0af24ab616e5b51f1d89f9ae38
diff --git a/trunk/net/netfilter/nfnetlink_log.c b/trunk/net/netfilter/nfnetlink_log.c
index c60273cad778..61cdda4e5d3b 100644
--- a/trunk/net/netfilter/nfnetlink_log.c
+++ b/trunk/net/netfilter/nfnetlink_log.c
@@ -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: