One step closer to turning the skb_frag_t into a bio_vec.
Showing the changes to include/linux (1 of 2 files). Show all
Unified · Split
| @@ -311,9 +311,7 @@ extern int sysctl_max_skb_frags; · 310 unmodified lines | |||
| 311 | typedef struct skb_frag_struct skb_frag_t; | 311 | typedef struct skb_frag_struct skb_frag_t; |
| 312 | 312 | ||
| 313 | struct skb_frag_struct { | 313 | struct skb_frag_struct { |
| 314 | struct { | 314 | struct page *bv_page; |
| 315 | struct page *p; | ||
| 316 | } page; | ||
| 317 | __u32 size; | 315 | __u32 size; |
| 318 | __u32 page_offset; | 316 | __u32 page_offset; |
| 319 | }; | 317 | }; |
| @@ -374,7 +372,7 @@ static inline bool skb_frag_must_loop(struct page *p) · 54 unmodified lines | |||
| 374 | * skb_frag_foreach_page - loop over pages in a fragment | 372 | * skb_frag_foreach_page - loop over pages in a fragment |
| 375 | * | 373 | * |
| 376 | * @f: skb frag to operate on | 374 | * @f: skb frag to operate on |
| 377 | * @f_off: offset from start of f->page.p | 375 | * @f_off: offset from start of f->bv_page |
| 378 | * @f_len: length from f_off to loop over | 376 | * @f_len: length from f_off to loop over |
| 379 | * @p: (temp var) current page | 377 | * @p: (temp var) current page |
| 380 | * @p_off: (temp var) offset from start of current page, | 378 | * @p_off: (temp var) offset from start of current page, |
| @@ -2084,7 +2082,7 @@ static inline void __skb_fill_page_desc(struct sk_buff *skb, int i, · 1703 unmodified lines | |||
| 2084 | * that not all callers have unique ownership of the page but rely | 2082 | * that not all callers have unique ownership of the page but rely |
| 2085 | * on page_is_pfmemalloc doing the right thing(tm). | 2083 | * on page_is_pfmemalloc doing the right thing(tm). |
| 2086 | */ | 2084 | */ |
| 2087 | frag->page.p = page; | 2085 | frag->bv_page = page; |
| 2088 | frag->page_offset = off; | 2086 | frag->page_offset = off; |
| 2089 | skb_frag_size_set(frag, size); | 2087 | skb_frag_size_set(frag, size); |
| 2090 | 2088 | ||
| @@ -2872,7 +2870,7 @@ static inline void skb_propagate_pfmemalloc(struct page *page, · 781 unmodified lines | |||
| 2872 | */ | 2870 | */ |
| 2873 | static inline struct page *skb_frag_page(const skb_frag_t *frag) | 2871 | static inline struct page *skb_frag_page(const skb_frag_t *frag) |
| 2874 | { | 2872 | { |
| 2875 | return frag->page.p; | 2873 | return frag->bv_page; |
| 2876 | } | 2874 | } |
| 2877 | 2875 | ||
| 2878 | /** | 2876 | /** |
| @@ -2958,7 +2956,7 @@ static inline void *skb_frag_address_safe(const skb_frag_t *frag) · 79 unmodified lines | |||
| 2958 | */ | 2956 | */ |
| 2959 | static inline void __skb_frag_set_page(skb_frag_t *frag, struct page *page) | 2957 | static inline void __skb_frag_set_page(skb_frag_t *frag, struct page *page) |
| 2960 | { | 2958 | { |
| 2961 | frag->page.p = page; | 2959 | frag->bv_page = page; |
| 2962 | } | 2960 | } |
| 2963 | 2961 | ||
| 2964 | /** | 2962 | /** |