kernel: bump 5.4 to 5.4.110

[openwrt/staging/chunkeey.git] / target / linux / generic / hack-5.4 / 721-phy_packets.patch

diff --git a/target/linux/generic/hack-5.4/721-phy_packets.patch b/target/linux/generic/hack-5.4/721-phy_packets.patch
index 55233369ef831a5db0ef10250396b1682f21a8cb..836fc54ba2977ebb3c5289fcc6b6976611fe5649 100644 (file)
--- a/target/linux/generic/hack-5.4/721-phy_packets.patch
+++ b/target/linux/generic/hack-5.4/721-phy_packets.patch
@@ -29,9 +29,9 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  #define IFF_LIVE_RENAME_OK            IFF_LIVE_RENAME_OK
 +#define IFF_NO_IP_ALIGN                       IFF_NO_IP_ALIGN
  
- /**
-  *    struct net_device - The DEVICE structure.
-@@ -1882,6 +1884,11 @@ struct net_device {
+ /* Specifies the type of the struct net_device::ml_priv pointer */
+ enum netdev_ml_priv_type {
+@@ -1889,6 +1891,11 @@ struct net_device {
        const struct tlsdev_ops *tlsdev_ops;
  #endif
  
@@ -43,7 +43,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        const struct header_ops *header_ops;
  
        unsigned int            flags;
-@@ -1964,6 +1971,10 @@ struct net_device {
+@@ -1971,6 +1978,10 @@ struct net_device {
        struct mpls_dev __rcu   *mpls_ptr;
  #endif