kernel: bump 6.1 to 6.1.68

[openwrt/staging/xback.git] / target / linux / generic / backport-6.1 / 795-v6.6-13-r8152-Block-future-register-access-if-register-acces.patch

diff --git a/target/linux/generic/backport-6.1/795-v6.6-13-r8152-Block-future-register-access-if-register-acces.patch b/target/linux/generic/backport-6.1/795-v6.6-13-r8152-Block-future-register-access-if-register-acces.patch
index 2cbe3650352d6b87d6793f618c8af3546251822e..8901767be5239e1d3c7e5fc9ec414a17c644aafc 100644 (file)
--- a/target/linux/generic/backport-6.1/795-v6.6-13-r8152-Block-future-register-access-if-register-acces.patch
+++ b/target/linux/generic/backport-6.1/795-v6.6-13-r8152-Block-future-register-access-if-register-acces.patch
@@ -232,7 +232,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  }
  
  static int generic_ocp_read(struct r8152 *tp, u16 index, u16 size,
-@@ -8261,7 +8355,7 @@ static int rtl8152_pre_reset(struct usb_
+@@ -8275,7 +8369,7 @@ static int rtl8152_pre_reset(struct usb_
        struct r8152 *tp = usb_get_intfdata(intf);
        struct net_device *netdev;
  
@@ -241,7 +241,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                return 0;
  
        netdev = tp->netdev;
-@@ -8276,7 +8370,9 @@ static int rtl8152_pre_reset(struct usb_
+@@ -8290,7 +8384,9 @@ static int rtl8152_pre_reset(struct usb_
        napi_disable(&tp->napi);
        if (netif_carrier_ok(netdev)) {
                mutex_lock(&tp->control);
@@ -251,7 +251,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                mutex_unlock(&tp->control);
        }
  
-@@ -8289,9 +8385,11 @@ static int rtl8152_post_reset(struct usb
+@@ -8303,9 +8399,11 @@ static int rtl8152_post_reset(struct usb
        struct net_device *netdev;
        struct sockaddr sa;
  
@@ -264,7 +264,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        /* reset the MAC address in case of policy change */
        if (determine_ethernet_addr(tp, &sa) >= 0) {
                rtnl_lock();
-@@ -9493,17 +9591,29 @@ static u8 __rtl_get_hw_ver(struct usb_de
+@@ -9507,17 +9605,29 @@ static u8 __rtl_get_hw_ver(struct usb_de
        __le32 *tmp;
        u8 version;
        int ret;
@@ -300,7 +300,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        kfree(tmp);
  
-@@ -9602,25 +9712,14 @@ static bool rtl8152_supports_lenovo_macp
+@@ -9616,25 +9726,14 @@ static bool rtl8152_supports_lenovo_macp
        return 0;
  }
  
@@ -328,7 +328,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        usb_reset_device(udev);
        netdev = alloc_etherdev(sizeof(struct r8152));
        if (!netdev) {
-@@ -9783,10 +9882,20 @@ static int rtl8152_probe(struct usb_inte
+@@ -9797,10 +9896,20 @@ static int rtl8152_probe(struct usb_inte
        else
                device_set_wakeup_enable(&udev->dev, false);
  
@@ -349,7 +349,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  out1:
        tasklet_kill(&tp->tx_tl);
        cancel_delayed_work_sync(&tp->hw_phy_work);
-@@ -9795,10 +9904,46 @@ out1:
+@@ -9809,10 +9918,46 @@ out1:
        rtl8152_release_firmware(tp);
        usb_set_intfdata(intf, NULL);
  out: