diff options
| author | David S. Miller | 2011-03-02 20:30:24 +0100 |
|---|---|---|
| committer | David S. Miller | 2011-03-02 20:30:24 +0100 |
| commit | 3872b284087081ee5cb0e4630954c2f7a2153cf5 (patch) | |
| tree | ead36598e35730e419edcf42dc788290af9e3d5b /net/netfilter/nfnetlink_log.c | |
| parent | inet: Replace left-over references to inet->cork (diff) | |
| parent | netfilter: nf_ct_tcp: fix out of sync scenario while in SYN_RECV (diff) | |
| download | kernel-qcow2-linux-3872b284087081ee5cb0e4630954c2f7a2153cf5.tar.gz kernel-qcow2-linux-3872b284087081ee5cb0e4630954c2f7a2153cf5.tar.xz kernel-qcow2-linux-3872b284087081ee5cb0e4630954c2f7a2153cf5.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/netfilter/nfnetlink_log.c')
| -rw-r--r-- | net/netfilter/nfnetlink_log.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c index 91592da504b9..985e9b76c916 100644 --- a/net/netfilter/nfnetlink_log.c +++ b/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); |