diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-01 00:22:26 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-01 00:22:26 -0400 |
| commit | 399f486286f44d55c4fff0e9cc5d712f2b443489 (patch) | |
| tree | 0c2820b3e04232eaa96f08c1057b87728fb3e7a4 /net/ipv4/ip_fragment.c | |
| parent | 481419ec9fbdf3f4ec5389c7e91a81b4a7ebee8d (diff) | |
| parent | a9edadbf790d72adf6ebed476cb5caf7743e7e4a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'net/ipv4/ip_fragment.c')
| -rw-r--r-- | net/ipv4/ip_fragment.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index a2e92f9709db..3b2e5adca838 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c | |||
| @@ -568,7 +568,7 @@ int ip_defrag(struct sk_buff *skb, u32 user) | |||
| 568 | 568 | ||
| 569 | IP_INC_STATS_BH(IPSTATS_MIB_REASMREQDS); | 569 | IP_INC_STATS_BH(IPSTATS_MIB_REASMREQDS); |
| 570 | 570 | ||
| 571 | net = skb->dev->nd_net; | 571 | net = skb->dev ? skb->dev->nd_net : skb->dst->dev->nd_net; |
| 572 | /* Start by cleaning up the memory. */ | 572 | /* Start by cleaning up the memory. */ |
| 573 | if (atomic_read(&net->ipv4.frags.mem) > net->ipv4.frags.high_thresh) | 573 | if (atomic_read(&net->ipv4.frags.mem) > net->ipv4.frags.high_thresh) |
| 574 | ip_evictor(net); | 574 | ip_evictor(net); |