diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-02 01:13:38 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-02 01:13:38 -0500 |
| commit | ff9c38bba37937adb909cceb2a6521f2e92e17c6 (patch) | |
| tree | 93bd6152d9fa28348be99ef1c788040cc7b7a94d /net/ipv4/ip_fragment.c | |
| parent | 65c0cfafce9575319fb6f70080fbe226e5617e3b (diff) | |
| parent | b2722b1c3a893ec6021508da15b32282ec79f4da (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/ht.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 1472d8e3c191..c4735310a923 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c | |||
| @@ -564,7 +564,7 @@ out_oversize: | |||
| 564 | printk(KERN_INFO "Oversized IP packet from %pI4.\n", | 564 | printk(KERN_INFO "Oversized IP packet from %pI4.\n", |
| 565 | &qp->saddr); | 565 | &qp->saddr); |
| 566 | out_fail: | 566 | out_fail: |
| 567 | IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_REASMFAILS); | 567 | IP_INC_STATS_BH(net, IPSTATS_MIB_REASMFAILS); |
| 568 | return err; | 568 | return err; |
| 569 | } | 569 | } |
| 570 | 570 | ||