diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-26 14:18:00 +0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-26 14:18:00 +0400 |
| commit | 45de6fd958d7f407bdb5fdc6914b3262519d891c (patch) | |
| tree | c1b9f9023e93d0f28f773ca4be41d107f79cd600 /include/linux | |
| parent | 1f5d5dbf0372dd933d8325054889ba09d996e50b (diff) | |
| parent | 3b908870b8332dfd40be0e919e187aa4991536fb (diff) | |
| download | linux-45de6fd958d7f407bdb5fdc6914b3262519d891c.tar.xz | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netfilter/x_tables.h | 4 | ||||
| -rw-r--r-- | include/linux/skbuff.h | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index f6bdef82a322..38701454e197 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h @@ -361,7 +361,11 @@ struct compat_xt_entry_target struct compat_xt_counters { +#if defined(CONFIG_X86_64) || defined(CONFIG_IA64) u_int32_t cnt[4]; +#else + u_int64_t cnt[2]; +#endif }; struct compat_xt_counters_info diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index c4619a428d9b..f8f234708b98 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -344,6 +344,13 @@ 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) +{ + if (unlikely((int)skb->truesize < sizeof(struct sk_buff) + skb->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, |