diff options
| author | Patrick McHardy <kaber@trash.net> | 2009-02-18 09:16:18 -0500 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2009-02-18 09:16:18 -0500 |
| commit | 4667ba15119fea265b79502a019a2e75b8c9dfe1 (patch) | |
| tree | 1df39006489a48bb575200f41e11895cba915238 /include/linux | |
| parent | 5955c7a2cfb6a35429adea5dc480002b15ca8cfc (diff) | |
| parent | 92a0acce186cde8ead56c6915d9479773673ea1a (diff) | |
Merge branch 'master' of /repos/git/net-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/skbuff.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index cf2cb50f77d1..9dcf956ad18a 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, | |||
| 416 | void *here); | 416 | void *here); |
| 417 | extern void skb_under_panic(struct sk_buff *skb, int len, | 417 | extern void skb_under_panic(struct sk_buff *skb, int len, |
| 418 | void *here); | 418 | void *here); |
| 419 | extern void skb_truesize_bug(struct sk_buff *skb); | ||
| 420 | |||
| 421 | static inline void skb_truesize_check(struct sk_buff *skb) | ||
| 422 | { | ||
| 423 | int len = sizeof(struct sk_buff) + skb->len; | ||
| 424 | |||
| 425 | if (unlikely((int)skb->truesize < len)) | ||
| 426 | skb_truesize_bug(skb); | ||
| 427 | } | ||
| 428 | 419 | ||
| 429 | extern int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb, | 420 | extern int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb, |
| 430 | int getfrag(void *from, char *to, int offset, | 421 | int getfrag(void *from, char *to, int offset, |