diff options
| author | Scott Wood <scottwood@freescale.com> | 2013-10-29 19:50:27 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2013-10-29 19:50:37 (GMT) |
| commit | d0ebef8230e267ec47d4d4a65fe3262e2ebb8026 (patch) | |
| tree | 24b8bb342576f543dac42d59821c4feb7ce07453 /include/linux/skbuff.h | |
| parent | 041f2bc64a985b30328de4cb596f04fd913a85de (diff) | |
| download | linux-fsl-qoriq-d0ebef8230e267ec47d4d4a65fe3262e2ebb8026.tar.xz | |
Revert to v3.8 (no RT, no stable)
Diffstat (limited to 'include/linux/skbuff.h')
| -rw-r--r-- | include/linux/skbuff.h | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 3da99c9b..320e976 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -132,7 +132,6 @@ struct sk_buff_head { __u32 qlen; spinlock_t lock; - raw_spinlock_t raw_lock; }; struct sk_buff; @@ -492,7 +491,7 @@ struct sk_buff { union { __u32 mark; __u32 dropcount; - __u32 reserved_tailroom; + __u32 avail_size; }; sk_buff_data_t inner_transport_header; @@ -1009,12 +1008,6 @@ static inline void skb_queue_head_init(struct sk_buff_head *list) __skb_queue_head_init(list); } -static inline void skb_queue_head_init_raw(struct sk_buff_head *list) -{ - raw_spin_lock_init(&list->raw_lock); - __skb_queue_head_init(list); -} - static inline void skb_queue_head_init_class(struct sk_buff_head *list, struct lock_class_key *class) { @@ -1276,13 +1269,11 @@ static inline void __skb_fill_page_desc(struct sk_buff *skb, int i, * do not lose pfmemalloc information as the pages would not be * allocated using __GFP_MEMALLOC. */ + if (page->pfmemalloc && !page->mapping) + skb->pfmemalloc = true; frag->page.p = page; frag->page_offset = off; skb_frag_size_set(frag, size); - - page = compound_head(page); - if (page->pfmemalloc && !page->mapping) - skb->pfmemalloc = true; } /** @@ -1437,10 +1428,7 @@ static inline int skb_tailroom(const struct sk_buff *skb) */ static inline int skb_availroom(const struct sk_buff *skb) { - if (skb_is_nonlinear(skb)) - return 0; - - return skb->end - skb->tail - skb->reserved_tailroom; + return skb_is_nonlinear(skb) ? 0 : skb->avail_size - skb->len; } /** @@ -2604,13 +2592,6 @@ static inline void nf_reset(struct sk_buff *skb) #endif } -static inline void nf_reset_trace(struct sk_buff *skb) -{ -#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE) - skb->nf_trace = 0; -#endif -} - /* Note: This doesn't put any conntrack and bridge info in dst. */ static inline void __nf_copy(struct sk_buff *dst, const struct sk_buff *src) { |