}
static int generic_ocp_read(struct r8152 *tp, u16 index, u16 size,
-@@ -8254,7 +8348,7 @@ static int rtl8152_pre_reset(struct usb_
+@@ -8268,7 +8362,7 @@ static int rtl8152_pre_reset(struct usb_
struct r8152 *tp = usb_get_intfdata(intf);
struct net_device *netdev;
return 0;
netdev = tp->netdev;
-@@ -8269,7 +8363,9 @@ static int rtl8152_pre_reset(struct usb_
+@@ -8283,7 +8377,9 @@ static int rtl8152_pre_reset(struct usb_
napi_disable(&tp->napi);
if (netif_carrier_ok(netdev)) {
mutex_lock(&tp->control);
mutex_unlock(&tp->control);
}
-@@ -8282,9 +8378,11 @@ static int rtl8152_post_reset(struct usb
+@@ -8296,9 +8392,11 @@ static int rtl8152_post_reset(struct usb
struct net_device *netdev;
struct sockaddr sa;
/* reset the MAC address in case of policy change */
if (determine_ethernet_addr(tp, &sa) >= 0) {
rtnl_lock();
-@@ -9482,17 +9580,29 @@ static u8 __rtl_get_hw_ver(struct usb_de
+@@ -9496,17 +9594,29 @@ static u8 __rtl_get_hw_ver(struct usb_de
__le32 *tmp;
u8 version;
int ret;
kfree(tmp);
-@@ -9566,25 +9676,14 @@ u8 rtl8152_get_version(struct usb_interf
+@@ -9580,25 +9690,14 @@ u8 rtl8152_get_version(struct usb_interf
}
EXPORT_SYMBOL_GPL(rtl8152_get_version);
usb_reset_device(udev);
netdev = alloc_etherdev(sizeof(struct r8152));
if (!netdev) {
-@@ -9757,10 +9856,20 @@ static int rtl8152_probe(struct usb_inte
+@@ -9771,10 +9870,20 @@ static int rtl8152_probe(struct usb_inte
else
device_set_wakeup_enable(&udev->dev, false);
out1:
tasklet_kill(&tp->tx_tl);
cancel_delayed_work_sync(&tp->hw_phy_work);
-@@ -9769,10 +9878,46 @@ out1:
+@@ -9783,10 +9892,46 @@ out1:
rtl8152_release_firmware(tp);
usb_set_intfdata(intf, NULL);
out: