diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-21 19:21:20 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-21 19:21:20 -0400 |
| commit | 29516d75a0b09e0a0328dd55c98a342515c9615a (patch) | |
| tree | 4b03326311958ad6de82653a1caf289ad8c38538 /net/ipv4/ipmr.c | |
| parent | 4ea78729b8dbfc400fe165a57b90a394a7275a54 (diff) | |
| parent | 4a4f8fdba6f5a34ca90f426021e17491a30202da (diff) | |
Auto merge with /home/aegl/GIT/linus
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; |