diff options
Diffstat (limited to 'target/linux/generic/backport-5.4')
4 files changed, 8 insertions, 68 deletions
diff --git a/target/linux/generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch b/target/linux/generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch index eeea18bb9c..13f0d9d000 100644 --- a/target/linux/generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch +++ b/target/linux/generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch @@ -66,7 +66,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -5423,8 +5423,7 @@ static inline void skb_gro_reset_offset( +@@ -5429,8 +5429,7 @@ static inline void skb_gro_reset_offset( NAPI_GRO_CB(skb)->frag0 = NULL; NAPI_GRO_CB(skb)->frag0_len = 0; diff --git a/target/linux/generic/backport-5.4/737-v5.5-net-phy-add-core-phylib-sfp-support.patch b/target/linux/generic/backport-5.4/737-v5.5-net-phy-add-core-phylib-sfp-support.patch index 11da9540e9..edfe151725 100644 --- a/target/linux/generic/backport-5.4/737-v5.5-net-phy-add-core-phylib-sfp-support.patch +++ b/target/linux/generic/backport-5.4/737-v5.5-net-phy-add-core-phylib-sfp-support.patch @@ -24,7 +24,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> #include <linux/workqueue.h> #include <linux/mdio.h> #include <linux/io.h> -@@ -843,6 +844,9 @@ void phy_stop(struct phy_device *phydev) +@@ -863,6 +864,9 @@ void phy_stop(struct phy_device *phydev) mutex_lock(&phydev->lock); @@ -34,7 +34,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> phydev->state = PHY_HALTED; mutex_unlock(&phydev->lock); -@@ -905,6 +909,9 @@ void phy_state_machine(struct work_struc +@@ -925,6 +929,9 @@ void phy_state_machine(struct work_struc old_state = phydev->state; diff --git a/target/linux/generic/backport-5.4/790-v5.7-net-switchdev-do-not-propagate-bridge-updates-across.patch b/target/linux/generic/backport-5.4/790-v5.7-net-switchdev-do-not-propagate-bridge-updates-across.patch deleted file mode 100644 index bc8014b772..0000000000 --- a/target/linux/generic/backport-5.4/790-v5.7-net-switchdev-do-not-propagate-bridge-updates-across.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 07c6f9805f12f1bb538ef165a092b300350384aa Mon Sep 17 00:00:00 2001 -From: Russell King <rmk+kernel@armlinux.org.uk> -Date: Wed, 26 Feb 2020 17:14:21 +0000 -Subject: [PATCH] net: switchdev: do not propagate bridge updates across - bridges - -When configuring a tree of independent bridges, propagating changes -from the upper bridge across a bridge master to the lower bridge -ports brings surprises. - -For example, a lower bridge may have vlan filtering enabled. It -may have a vlan interface attached to the bridge master, which may -then be incorporated into another bridge. As soon as the lower -bridge vlan interface is attached to the upper bridge, the lower -bridge has vlan filtering disabled. - -This occurs because switchdev recursively applies its changes to -all lower devices no matter what. - -Reviewed-by: Ido Schimmel <idosch@mellanox.com> -Tested-by: Ido Schimmel <idosch@mellanox.com> -Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> -Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> -Signed-off-by: David S. Miller <davem@davemloft.net> ---- - net/switchdev/switchdev.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - ---- a/net/switchdev/switchdev.c -+++ b/net/switchdev/switchdev.c -@@ -476,6 +476,9 @@ static int __switchdev_handle_port_obj_a - * necessary to go through this helper. - */ - netdev_for_each_lower_dev(dev, lower_dev, iter) { -+ if (netif_is_bridge_master(lower_dev)) -+ continue; -+ - err = __switchdev_handle_port_obj_add(lower_dev, port_obj_info, - check_cb, add_cb); - if (err && err != -EOPNOTSUPP) -@@ -528,6 +531,9 @@ static int __switchdev_handle_port_obj_d - * necessary to go through this helper. - */ - netdev_for_each_lower_dev(dev, lower_dev, iter) { -+ if (netif_is_bridge_master(lower_dev)) -+ continue; -+ - err = __switchdev_handle_port_obj_del(lower_dev, port_obj_info, - check_cb, del_cb); - if (err && err != -EOPNOTSUPP) -@@ -579,6 +585,9 @@ static int __switchdev_handle_port_attr_ - * necessary to go through this helper. - */ - netdev_for_each_lower_dev(dev, lower_dev, iter) { -+ if (netif_is_bridge_master(lower_dev)) -+ continue; -+ - err = __switchdev_handle_port_attr_set(lower_dev, port_attr_info, - check_cb, set_cb); - if (err && err != -EOPNOTSUPP) diff --git a/target/linux/generic/backport-5.4/800-v5.5-scsi-core-Add-sysfs-attributes-for-VPD-pages-0h-and-.patch b/target/linux/generic/backport-5.4/800-v5.5-scsi-core-Add-sysfs-attributes-for-VPD-pages-0h-and-.patch index 438588f9f4..8c18d5df6d 100644 --- a/target/linux/generic/backport-5.4/800-v5.5-scsi-core-Add-sysfs-attributes-for-VPD-pages-0h-and-.patch +++ b/target/linux/generic/backport-5.4/800-v5.5-scsi-core-Add-sysfs-attributes-for-VPD-pages-0h-and-.patch @@ -41,9 +41,9 @@ Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> struct scsi_vpd *vpd_pg80 = NULL, *vpd_pg83 = NULL; + struct scsi_vpd *vpd_pg0 = NULL, *vpd_pg89 = NULL; unsigned long flags; + struct module *mod; - sdev = container_of(work, struct scsi_device, ew.work); -@@ -466,16 +467,24 @@ static void scsi_device_dev_release_user +@@ -469,16 +470,24 @@ static void scsi_device_dev_release_user sdev->request_queue = NULL; mutex_lock(&sdev->inquiry_mutex); @@ -68,7 +68,7 @@ Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> kfree(sdev->inquiry); kfree(sdev); -@@ -874,6 +883,8 @@ static struct bin_attribute dev_attr_vpd +@@ -883,6 +892,8 @@ static struct bin_attribute dev_attr_vpd sdev_vpd_pg_attr(pg83); sdev_vpd_pg_attr(pg80); @@ -77,7 +77,7 @@ Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> static ssize_t show_inquiry(struct file *filep, struct kobject *kobj, struct bin_attribute *bin_attr, -@@ -1206,12 +1217,18 @@ static umode_t scsi_sdev_bin_attr_is_vis +@@ -1215,12 +1226,18 @@ static umode_t scsi_sdev_bin_attr_is_vis struct scsi_device *sdev = to_scsi_device(dev); @@ -96,7 +96,7 @@ Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> return S_IRUGO; } -@@ -1254,8 +1271,10 @@ static struct attribute *scsi_sdev_attrs +@@ -1263,8 +1280,10 @@ static struct attribute *scsi_sdev_attrs }; static struct bin_attribute *scsi_sdev_bin_attrs[] = { |