diff options
author | 2011-09-18 14:01:26 +0200 | |
---|---|---|
committer | 2011-09-18 14:01:39 +0200 | |
commit | bfa322c48dc69bfdaee10faf3bd8dbc23b39a21c (patch) | |
tree | 95360c5d253115003080264d878f3c0f907f2978 /net/netfilter/nf_queue.c | |
parent | sched: Add documentation for bandwidth control (diff) | |
parent | lib/sha1.c: quiet sparse noise about symbol not declared (diff) | |
download | linux-dev-bfa322c48dc69bfdaee10faf3bd8dbc23b39a21c.tar.xz linux-dev-bfa322c48dc69bfdaee10faf3bd8dbc23b39a21c.zip |
Merge branch 'linus' into sched/core
Merge reason: We are queueing up a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/netfilter/nf_queue.c')
-rw-r--r-- | net/netfilter/nf_queue.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c index 5b466cd1272f..84d0fd47636a 100644 --- a/net/netfilter/nf_queue.c +++ b/net/netfilter/nf_queue.c @@ -312,6 +312,7 @@ void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict) } break; case NF_STOLEN: + break; default: kfree_skb(skb); } |