diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-20 02:27:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-20 02:27:41 -0700 |
| commit | 2b1c4354de72ced917d2f3fe88117613f992234b (patch) | |
| tree | 3e7643cad45d94e3c331366418532043bd4fa5a9 /net/ipv4 | |
| parent | 5e140dfc1fe87eae27846f193086724806b33c7d (diff) | |
| parent | 170ebf85160dd128e1c4206cc197cce7d1424705 (diff) | |
| download | blackbird-op-linux-2b1c4354de72ced917d2f3fe88117613f992234b.tar.gz blackbird-op-linux-2b1c4354de72ced917d2f3fe88117613f992234b.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/virtio_net.c
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/ip_fragment.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index 6659ac000eeb..7985346653bd 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c @@ -463,6 +463,7 @@ err: static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev, struct net_device *dev) { + struct net *net = container_of(qp->q.net, struct net, ipv4.frags); struct iphdr *iph; struct sk_buff *fp, *head = qp->q.fragments; int len; @@ -548,7 +549,7 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev, iph = ip_hdr(head); iph->frag_off = 0; iph->tot_len = htons(len); - IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_REASMOKS); + IP_INC_STATS_BH(net, IPSTATS_MIB_REASMOKS); qp->q.fragments = NULL; return 0; |
