diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-13 14:14:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-13 14:14:10 -0700 |
| commit | e7874c996b8591f59d78efa519031dab5b58723b (patch) | |
| tree | 14aa8dea0c33de9d22ef8177fb242c9d80d693de /net/ipv6/netfilter/ip6_queue.c | |
| parent | 4a6346d4ea63b5e1390babf22f1cc0f113d8082b (diff) | |
| parent | 736d58e3a2245ac2779fe0f278f8735bcf33ca8d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/ipv6/netfilter/ip6_queue.c')
| -rw-r--r-- | net/ipv6/netfilter/ip6_queue.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c index 8656eb75520..8c201743d96 100644 --- a/net/ipv6/netfilter/ip6_queue.c +++ b/net/ipv6/netfilter/ip6_queue.c @@ -462,7 +462,6 @@ __ipq_rcv_skb(struct sk_buff *skb) if (flags & NLM_F_ACK) netlink_ack(skb, nlh, 0); - return; } static void |