diff options
author | David S. Miller | 2009-12-03 22:23:12 +0100 |
---|---|---|
committer | David S. Miller | 2009-12-03 22:23:12 +0100 |
commit | 424eff975192553a9ea8bfd51bf65039ffb356ef (patch) | |
tree | 5fa7b15715b3ce904f7250c50d09bc921d9f28bf /net/ipv4/netfilter/ipt_ULOG.c | |
parent | bnx2: Update version to 2.0.3. (diff) | |
parent | netfilter: net/ipv[46]/netfilter: Move && and || to end of previous line (diff) | |
download | kernel-qcow2-linux-424eff975192553a9ea8bfd51bf65039ffb356ef.tar.gz kernel-qcow2-linux-424eff975192553a9ea8bfd51bf65039ffb356ef.tar.xz kernel-qcow2-linux-424eff975192553a9ea8bfd51bf65039ffb356ef.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/ipv4/netfilter/ipt_ULOG.c')
-rw-r--r-- | net/ipv4/netfilter/ipt_ULOG.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c index d32cc4bb328a..399061c3fd7d 100644 --- a/net/ipv4/netfilter/ipt_ULOG.c +++ b/net/ipv4/netfilter/ipt_ULOG.c @@ -226,9 +226,9 @@ static void ipt_ulog_packet(unsigned int hooknum, else *(pm->prefix) = '\0'; - if (in && in->hard_header_len > 0 - && skb->mac_header != skb->network_header - && in->hard_header_len <= ULOG_MAC_LEN) { + if (in && in->hard_header_len > 0 && + skb->mac_header != skb->network_header && + in->hard_header_len <= ULOG_MAC_LEN) { memcpy(pm->mac, skb_mac_header(skb), in->hard_header_len); pm->mac_len = in->hard_header_len; } else |