diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-25 13:31:46 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-25 13:31:46 +1100 |
| commit | 16fddf5457d2a7eb5e96ceb016a8f722eca97af6 (patch) | |
| tree | ae3083a50c55f1e1a2c83f475d0e8bb2da8d7196 /net/ipv4/ip_fragment.c | |
| parent | 5492a7e4cba8e38419d489f0865de0a67c737e8a (diff) | |
| parent | cc7feea39bed2951cc29af3ad642f39a99dfe8d3 (diff) | |
Merge branch 'linux-2.6' into merge
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 a2e92f9709d..3b2e5adca83 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) IP_INC_STATS_BH(IPSTATS_MIB_REASMREQDS); - net = skb->dev->nd_net; + net = skb->dev ? skb->dev->nd_net : skb->dst->dev->nd_net; /* Start by cleaning up the memory. */ if (atomic_read(&net->ipv4.frags.mem) > net->ipv4.frags.high_thresh) ip_evictor(net); |