diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 18:45:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 18:45:19 -0400 |
commit | 4a4f8fdba6f5a34ca90f426021e17491a30202da (patch) | |
tree | 6eb8be6c9542845321252b1d64394a2c2ea84dd0 /net/ipv4/ipmr.c | |
parent | 2c6e5a839f92591a4bc6cac4a575d42151645af3 (diff) | |
parent | 90f66914c89b0be63548d4387d1211280aa7bc8e (diff) |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/ipmr.c')
-rw-r--r-- | net/ipv4/ipmr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index e21c049ec62a..e4f809a93f47 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c | |||
@@ -1350,6 +1350,7 @@ int ip_mr_input(struct sk_buff *skb) | |||
1350 | */ | 1350 | */ |
1351 | read_lock(&mrt_lock); | 1351 | read_lock(&mrt_lock); |
1352 | if (mroute_socket) { | 1352 | if (mroute_socket) { |
1353 | nf_reset(skb); | ||
1353 | raw_rcv(mroute_socket, skb); | 1354 | raw_rcv(mroute_socket, skb); |
1354 | read_unlock(&mrt_lock); | 1355 | read_unlock(&mrt_lock); |
1355 | return 0; | 1356 | return 0; |