diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-03-06 12:13:52 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-03-06 12:13:52 -0500 |
| commit | 1264fa6f8c5bf561a86128b2d48ace53e3f1e66f (patch) | |
| tree | 69872715982d49ddea5819040c7032062376183b /include/linux/skbuff.h | |
| parent | efeff568677aa325f84d3ce37c219019887a79eb (diff) | |
| parent | 559595a985e106d2fa9f0c79b7f5805453fed593 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c-fixes
Diffstat (limited to 'include/linux/skbuff.h')
| -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, |