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 /include | |
| parent | 5955c7a2cfb6a35429adea5dc480002b15ca8cfc (diff) | |
| parent | 92a0acce186cde8ead56c6915d9479773673ea1a (diff) | |
Merge branch 'master' of /repos/git/net-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/skbuff.h | 9 | ||||
| -rw-r--r-- | include/net/sock.h | 1 |
2 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index cf2cb50f77d..9dcf956ad18 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -416,15 +416,6 @@ extern void skb_over_panic(struct sk_buff *skb, int len, void *here); extern void skb_under_panic(struct sk_buff *skb, int len, void *here); -extern void skb_truesize_bug(struct sk_buff *skb); - -static inline void skb_truesize_check(struct sk_buff *skb) -{ - int len = sizeof(struct sk_buff) + skb->len; - - if (unlikely((int)skb->truesize < len)) - skb_truesize_bug(skb); -} extern int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb, int getfrag(void *from, char *to, int offset, diff --git a/include/net/sock.h b/include/net/sock.h index ce3b5b62268..eefeeaf7fc4 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -860,7 +860,6 @@ static inline void sk_mem_uncharge(struct sock *sk, int size) static inline void sk_wmem_free_skb(struct sock *sk, struct sk_buff *skb) { - skb_truesize_check(skb); sock_set_flag(sk, SOCK_QUEUE_SHRUNK); sk->sk_wmem_queued -= skb->truesize; sk_mem_uncharge(sk, skb->truesize); |