[openwrt/openwrt] mac80211: add missing backports for building with 4.14 kernels

LEDE Commits lede-commits at lists.infradead.org
Fri Aug 14 11:27:49 EDT 2020


nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/6bdd4c967b64332af60175b32a42ea6d2de295df

commit 6bdd4c967b64332af60175b32a42ea6d2de295df
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Fri Aug 14 16:32:23 2020 +0200

    mac80211: add missing backports for building with 4.14 kernels
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 .../070-backports-add-netif_receive_skb_list.patch | 30 ++++++++++++++++++++++
 .../071-backports-add-skb_list_del_init.patch      | 24 +++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/package/kernel/mac80211/patches/subsys/070-backports-add-netif_receive_skb_list.patch b/package/kernel/mac80211/patches/subsys/070-backports-add-netif_receive_skb_list.patch
new file mode 100644
index 0000000000..b26a6bc389
--- /dev/null
+++ b/package/kernel/mac80211/patches/subsys/070-backports-add-netif_receive_skb_list.patch
@@ -0,0 +1,30 @@
+From: Felix Fietkau <nbd at nbd.name>
+Date: Fri, 14 Aug 2020 16:13:45 +0200
+Subject: [PATCH] backports: add netif_receive_skb_list
+
+It will be needed by pending mac80211 changes
+
+Signed-off-by: Felix Fietkau <nbd at nbd.name>
+---
+
+--- a/backport-include/linux/netdevice.h
++++ b/backport-include/linux/netdevice.h
+@@ -372,6 +372,18 @@ static inline int _bp_netdev_upper_dev_l
+ 	macro_dispatcher(netdev_upper_dev_link, __VA_ARGS__)(__VA_ARGS__)
+ #endif
+ 
++#if LINUX_VERSION_IS_LESS(4,19,0)
++static inline void netif_receive_skb_list(struct list_head *head)
++{
++	struct sk_buff *skb, *next;
++
++	list_for_each_entry_safe(skb, next, head, list) {
++		skb_list_del_init(skb);
++		netif_receive_skb(skb);
++	}
++}
++#endif
++
+ #if LINUX_VERSION_IS_LESS(5,0,0)
+ static inline int backport_dev_open(struct net_device *dev, struct netlink_ext_ack *extack)
+ {
diff --git a/package/kernel/mac80211/patches/subsys/071-backports-add-skb_list_del_init.patch b/package/kernel/mac80211/patches/subsys/071-backports-add-skb_list_del_init.patch
new file mode 100644
index 0000000000..ee7e63498a
--- /dev/null
+++ b/package/kernel/mac80211/patches/subsys/071-backports-add-skb_list_del_init.patch
@@ -0,0 +1,24 @@
+From: Felix Fietkau <nbd at nbd.name>
+Date: Fri, 14 Aug 2020 16:13:55 +0200
+Subject: [PATCH] backports: add skb_list_del_init
+
+It will be needed by pending mac80211 changes
+
+Signed-off-by: Felix Fietkau <nbd at nbd.name>
+---
+
+--- a/backport-include/linux/skbuff.h
++++ b/backport-include/linux/skbuff.h
+@@ -384,6 +384,12 @@ static inline void skb_mark_not_on_list(
+ {
+ 	skb->next = NULL;
+ }
++
++static inline void skb_list_del_init(struct sk_buff *skb)
++{
++	__list_del_entry(&skb->list);
++	skb_mark_not_on_list(skb);
++}
+ #endif /* 4.19.10 <= x < 4.20 */
+ #endif
+ 



More information about the lede-commits mailing list