diff options
| author | Tony Lindgren <tony@atomide.com> | 2021-02-15 07:41:56 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2021-02-15 07:41:56 +0300 |
| commit | 857de6fe2f86b009df620f7cdb07c262cc17070d (patch) | |
| tree | e9718ebeeef39485a51a9f8e3c8122da18c796cf /include/linux/skbuff.h | |
| parent | 9bbce32a20d6a72c767a7f85fd6127babd1410ac (diff) | |
| parent | fbfa463be8dc7957ee4f81556e9e1ea2a951807d (diff) | |
| download | linux-857de6fe2f86b009df620f7cdb07c262cc17070d.tar.xz | |
Merge branch 'fixes-v5.11' into fixes
Diffstat (limited to 'include/linux/skbuff.h')
| -rw-r--r-- | include/linux/skbuff.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 333bcdc39635..5f60c9e907c9 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -366,7 +366,7 @@ static inline void skb_frag_size_sub(skb_frag_t *frag, int delta) static inline bool skb_frag_must_loop(struct page *p) { #if defined(CONFIG_HIGHMEM) - if (PageHighMem(p)) + if (IS_ENABLED(CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP) || PageHighMem(p)) return true; #endif return false; @@ -1203,6 +1203,7 @@ struct skb_seq_state { struct sk_buff *root_skb; struct sk_buff *cur_skb; __u8 *frag_data; + __u32 frag_off; }; void skb_prepare_seq_read(struct sk_buff *skb, unsigned int from, |