backports: Remove support for kernel smaller than 4.11

This removes all the code which is needed to support kernel 4.10. Signed-off-by: Hauke Mehrtens <[email protected]>
hauke · Feb 6, 2024 · 848e6bc · 848e6bc
1 parent 50aae17
commit 848e6bc
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 125 deletions.
diff --git a/.github/workflows/create.yml b/.github/workflows/create.yml
@@ -55,7 +55,6 @@ jobs:
     strategy:
       matrix:
         kernel: [
-           "4.10",
            "4.11",
            "4.12",
            "4.13",

diff --git a/README b/README
@@ -8,7 +8,7 @@ down to older kernels. It currently backports the following subsystems:
   * WWAN
 
 This package provides the latest Linux kernel subsystem enhancements
-for kernels 4.10 and above.
+for kernels 4.11 and above.
 
 # Documentation
 

diff --git a/backport/backport-include/linux/etherdevice.h b/backport/backport-include/linux/etherdevice.h
diff --git a/backport/backport-include/linux/netdevice.h b/backport/backport-include/linux/netdevice.h
@@ -94,11 +94,6 @@ static inline void dev_sw_netstats_tx_add(struct net_device *dev,
 void dev_get_tstats64(struct net_device *dev, struct rtnl_link_stats64 *s);
 #endif /* < 5.11 */
 
-#if LINUX_VERSION_IS_LESS(4,11,0)
-struct rtnl_link_stats64 *
-bp_dev_get_tstats64(struct net_device *dev, struct rtnl_link_stats64 *s);
-#endif /* < 4.11 */
-
 #if LINUX_VERSION_IS_LESS(5,15,0)
 #define get_user_ifreq LINUX_BACKPORT(get_user_ifreq)
 int get_user_ifreq(struct ifreq *ifr, void __user **ifrdata, void __user *arg);

diff --git a/backport/backport-include/linux/random.h b/backport/backport-include/linux/random.h
diff --git a/backport/backport-include/linux/sched.h b/backport/backport-include/linux/sched.h
@@ -5,9 +5,7 @@
 #include <linux/version.h>
 
 #if LINUX_VERSION_IS_LESS(5,9,0)
-#if LINUX_VERSION_IS_GEQ(4,11,0)
 #include <uapi/linux/sched/types.h>
-#endif
 
 static inline void sched_set_fifo_low(struct task_struct *p)
 {

diff --git a/backport/backport-include/linux/skbuff.h b/backport/backport-include/linux/skbuff.h
@@ -72,14 +72,6 @@ static inline void skb_mark_not_on_list(struct sk_buff *skb)
 #endif /* 4.19.10 <= x < 4.20 */
 #endif
 
-#if LINUX_VERSION_IS_LESS(4,11,0)
-#define skb_mac_offset LINUX_BACKPORT(skb_mac_offset)
-static inline int skb_mac_offset(const struct sk_buff *skb)
-{
-	return skb_mac_header(skb) - skb->data;
-}
-#endif
-
 #if LINUX_VERSION_IS_LESS(5,4,0)
 /**
  * skb_frag_off() - Returns the offset of a skb fragment

diff --git a/backport/backport-include/linux/virtio_config.h b/backport/backport-include/linux/virtio_config.h
@@ -4,22 +4,14 @@
 
 #include <linux/version.h>
 
-#if LINUX_VERSION_IS_LESS(4,11,0)
-struct irq_affinity;
-#endif
-
 #if LINUX_VERSION_IS_LESS(4,12,0)
 static inline
 int virtio_find_vqs(struct virtio_device *vdev, unsigned nvqs,
 			struct virtqueue *vqs[], vq_callback_t *callbacks[],
 			const char *names[],
 			struct irq_affinity *desc)
 {
-#if LINUX_VERSION_IS_LESS(4,11,0)
-	return vdev->config->find_vqs(vdev, nvqs, vqs, callbacks, names);
-#else
 	return vdev->config->find_vqs(vdev, nvqs, vqs, callbacks, names, desc);
-#endif
 }
 #endif /* < 4.12 */
 

diff --git a/backport/compat/Makefile b/backport/compat/Makefile
@@ -7,7 +7,6 @@ endif
 compat-y += main.o
 
 # Kernel backport compatibility code
-compat-$(CPTCFG_KERNEL_4_11) += backport-4.11.o
 compat-$(CPTCFG_KERNEL_4_12) += backport-4.12.o
 compat-$(CPTCFG_KERNEL_4_18) += backport-4.18.o
 compat-$(CPTCFG_KERNEL_5_2) += backport-5.2.o backport-genetlink.o

diff --git a/backport/compat/backport-4.11.c b/backport/compat/backport-4.11.c
diff --git a/patches/0075-ndo-stats-64.cocci b/patches/0075-ndo-stats-64.cocci