| Message ID | 20190805120704.13128-7-hauke@hauke-m.de (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | backports: Update to kernel 5.3-rc3 | expand |
diff --git a/backport/backport-include/linux/skbuff.h b/backport/backport-include/linux/skbuff.h index 44b2a5de..de943916 100644 --- a/backport/backport-include/linux/skbuff.h +++ b/backport/backport-include/linux/skbuff.h @@ -200,15 +200,6 @@ static inline struct sk_buff *__pskb_copy_fclone(struct sk_buff *skb, struct sk_buff *skb_clone_sk(struct sk_buff *skb); #endif -static inline bool skb_xmit_more(struct sk_buff *skb) -{ -#if LINUX_VERSION_IS_LESS(3,18,0) - return false; -#else - return skb->xmit_more; -#endif -} - #if LINUX_VERSION_IS_LESS(3,19,0) /** * __dev_alloc_pages - allocate page for network Rx diff --git a/patches/0059-skb_xmit_more/skb_no_xmit_more.cocci b/patches/0059-skb_xmit_more/skb_no_xmit_more.cocci deleted file mode 100644 index bf7f22e2..00000000 --- a/patches/0059-skb_xmit_more/skb_no_xmit_more.cocci +++ /dev/null @@ -1,5 +0,0 @@ -@@ -struct sk_buff *skb; -@@ --skb->xmit_more -+skb_xmit_more(skb)
The xmit_more member was removed from struture sk_buff and the skb_xmit_more() function is not used in backports any more, just remove this code as it does not compile any more on kernel 5.2 and more recent. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- backport/backport-include/linux/skbuff.h | 9 --------- patches/0059-skb_xmit_more/skb_no_xmit_more.cocci | 5 ----- 2 files changed, 14 deletions(-) delete mode 100644 patches/0059-skb_xmit_more/skb_no_xmit_more.cocci