From f9af5aa6871a3f117346967bdcd5b382dd17241c Mon Sep 17 00:00:00 2001
From: Florian Westphal <fw@strlen.de>
Date: Tue, 15 Feb 2011 21:59:37 +0100
Subject: [PATCH] --- yaml --- r: 237531 b: refs/heads/master c:
 8248779b1878f17cce2bb809831f4f2a252bdb77 h: refs/heads/master i:   237529:
 83f993774452610b387e9353ff22fbca378f8c24   237527:
 3a18502421ac22d8c047664486e613b69fac8b74 v: v3

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

diff --git a/[refs] b/[refs]
index 6382568b91d0..0abd31e12447 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2361c8735e07322023aedc36e4938b35af31eb0
+refs/heads/master: 8248779b1878f17cce2bb809831f4f2a252bdb77
diff --git a/trunk/net/netfilter/nfnetlink_log.c b/trunk/net/netfilter/nfnetlink_log.c
index 91592da504b9..985e9b76c916 100644
--- a/trunk/net/netfilter/nfnetlink_log.c
+++ b/trunk/net/netfilter/nfnetlink_log.c
@@ -376,7 +376,6 @@ __build_packet_message(struct nfulnl_instance *inst,
 			unsigned int hooknum,
 			const struct net_device *indev,
 			const struct net_device *outdev,
-			const struct nf_loginfo *li,
 			const char *prefix, unsigned int plen)
 {
 	struct nfulnl_msg_packet_hdr pmsg;
@@ -652,7 +651,7 @@ nfulnl_log_packet(u_int8_t pf,
 	inst->qlen++;
 
 	__build_packet_message(inst, skb, data_len, pf,
-				hooknum, in, out, li, prefix, plen);
+				hooknum, in, out, prefix, plen);
 
 	if (inst->qlen >= qthreshold)
 		__nfulnl_flush(inst);