diff options
| author |   David S. Miller <davem@davemloft.net> | 2010-08-21 23:32:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-21 23:32:24 -0700 |
| commit | d3c6e7ad09cebbad1a3dea077668062136626fd2 (patch) | |
| tree | 698022508a8d8c76a5d2cf55e50232079d6b1f42 /net/core/dev.c | |
| parent | amd8111e: use net_device_stats from struct net_device (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (diff) | |
| download | linux-dev-d3c6e7ad09cebbad1a3dea077668062136626fd2.tar.xz linux-dev-d3c6e7ad09cebbad1a3dea077668062136626fd2.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 4d74d26b8e1a..7cd5237d9822 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3156,7 +3156,7 @@ pull: put_page(skb_shinfo(skb)->frags[0].page); memmove(skb_shinfo(skb)->frags, skb_shinfo(skb)->frags + 1, - --skb_shinfo(skb)->nr_frags); + --skb_shinfo(skb)->nr_frags * sizeof(skb_frag_t)); } } |