diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-24 01:54:03 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-24 01:54:03 -0400 |
| commit | 06802a819a0a2d31c952c0624cea6cd00e4e50da (patch) | |
| tree | 8ccd7c668c7fbd8f08cb89426006040217caf3f1 /net/ipv4/ip_fragment.c | |
| parent | 9bd512f619cc116b7830134d7c9f6e404a38c7bf (diff) | |
| parent | 8f3ea33a5078a09eba12bfe57424507809367756 (diff) | |
Merge branch 'master' of ../net-2.6/
Conflicts:
net/ipv6/ndisc.c
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); |