From: Johannes Berg <johannes.berg@xxxxxxxxx>
Replace the existing skb->xmit_more semantic patch rule with a more
generic one that uses a helper inline function.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Luca Coelho <luciano.coelho@xxxxxxxxx>
---
backport/backport-include/linux/skbuff.h | 9 +++++++++
patches/0059-skb_xmit_more/skb_no_xmit_more.cocci | 10 +++-------
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/backport/backport-include/linux/skbuff.h b/backport/backport-include/linux/skbuff.h
index 034206b6649d..61133c4277cc 100644
--- a/backport/backport-include/linux/skbuff.h
+++ b/backport/backport-include/linux/skbuff.h
@@ -200,6 +200,15 @@ 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
index ab20c833af40..bf7f22e267a3 100644
--- a/patches/0059-skb_xmit_more/skb_no_xmit_more.cocci
+++ b/patches/0059-skb_xmit_more/skb_no_xmit_more.cocci
@@ -1,9 +1,5 @@
-@r1@
+@@
struct sk_buff *skb;
-expression E1;
@@
- if (E1
-+#if LINUX_VERSION_IS_GEQ(3,18,0)
- || !skb->xmit_more
-+#endif /* if LINUX_VERSION_IS_GEQ(3,18,0) */
- ) {...}
+-skb->xmit_more
++skb_xmit_more(skb)
--
2.18.0
--
To unsubscribe from this list: send the line "unsubscribe backports" in
