diff options
| author | Patrick McHardy <kaber@trash.net> | 2009-02-18 15:16:18 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2009-02-18 15:16:18 +0100 |
| commit | 4667ba15119fea265b79502a019a2e75b8c9dfe1 (patch) | |
| tree | 1df39006489a48bb575200f41e11895cba915238 /net | |
| parent | 5955c7a2cfb6a35429adea5dc480002b15ca8cfc (diff) | |
| parent | 92a0acce186cde8ead56c6915d9479773673ea1a (diff) | |
| download | linux-4667ba15119fea265b79502a019a2e75b8c9dfe1.tar.bz2 | |
Merge branch 'master' of /repos/git/net-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/skbuff.c | 8 | ||||
| -rw-r--r-- | net/core/sock.c | 1 |
2 files changed, 0 insertions, 9 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index da74b844f4ea..c6a6b166f8d6 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -143,14 +143,6 @@ void skb_under_panic(struct sk_buff *skb, int sz, void *here) BUG(); } -void skb_truesize_bug(struct sk_buff *skb) -{ - WARN(net_ratelimit(), KERN_ERR "SKB BUG: Invalid truesize (%u) " - "len=%u, sizeof(sk_buff)=%Zd\n", - skb->truesize, skb->len, sizeof(struct sk_buff)); -} -EXPORT_SYMBOL(skb_truesize_bug); - /* Allocate a new skbuff. We do this ourselves so we can fill in a few * 'private' fields and also do memory statistics to find all the * [BEEP] leaks. diff --git a/net/core/sock.c b/net/core/sock.c index 6f2e1337975d..6e4f14d1ef81 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1137,7 +1137,6 @@ void sock_rfree(struct sk_buff *skb) { struct sock *sk = skb->sk; - skb_truesize_check(skb); atomic_sub(skb->truesize, &sk->sk_rmem_alloc); sk_mem_uncharge(skb->sk, skb->truesize); } |