diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-24 06:50:29 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-24 06:50:29 -0500 |
| commit | e70049b9e74267dd47e1ffa62302073487afcb48 (patch) | |
| tree | 2cd000c0751ef31c9044b020d63f278cdf4f332d /include/linux/skbuff.h | |
| parent | d18921a0e319ab512f8186b1b1142c7b8634c779 (diff) | |
| parent | f7e603ad8f78cd3b59e33fa72707da0cbabdf699 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
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 f96bc91bf0a3..61ce97a8b868 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
| @@ -466,15 +466,6 @@ extern void skb_over_panic(struct sk_buff *skb, int len, | |||
| 466 | void *here); | 466 | void *here); |
| 467 | extern void skb_under_panic(struct sk_buff *skb, int len, | 467 | extern void skb_under_panic(struct sk_buff *skb, int len, |
| 468 | void *here); | 468 | void *here); |
| 469 | extern void skb_truesize_bug(struct sk_buff *skb); | ||
| 470 | |||
| 471 | static inline void skb_truesize_check(struct sk_buff *skb) | ||
| 472 | { | ||
| 473 | int len = sizeof(struct sk_buff) + skb->len; | ||
| 474 | |||
| 475 | if (unlikely((int)skb->truesize < len)) | ||
| 476 | skb_truesize_bug(skb); | ||
| 477 | } | ||
| 478 | 469 | ||
| 479 | extern int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb, | 470 | extern int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb, |
| 480 | int getfrag(void *from, char *to, int offset, | 471 | int getfrag(void *from, char *to, int offset, |