--- zzzz-none-000/linux-5.15.111/drivers/net/usb/asix_devices.c 2023-05-11 14:00:40.000000000 +0000 +++ puma7-atom-6670-761/linux-5.15.111/drivers/net/usb/asix_devices.c 2024-02-07 10:23:12.000000000 +0000 @@ -6,6 +6,10 @@ * Copyright (C) 2006 James Painter * Copyright (c) 2002-2003 TiVo Inc. */ +/* + * Includes Intel Corporation's changes/modifications dated: 2018. + * Changed/modified portions - Copyright (c) 2018 , Intel Corporation. + */ #include "asix.h" @@ -608,6 +612,7 @@ asix_read_medium_status(dev, 1)); } +#if 0 /* was replaced for usbnet_suspend */ static int asix_suspend(struct usb_interface *intf, pm_message_t message) { struct usbnet *dev = usb_get_intfdata(intf); @@ -618,6 +623,7 @@ return usbnet_suspend(intf, message); } +#endif static void ax88772_resume(struct usbnet *dev) { @@ -646,6 +652,7 @@ phy_start(priv->phydev); } +#if 0 /* was replaced for usbnet_resume */ static int asix_resume(struct usb_interface *intf) { struct usbnet *dev = usb_get_intfdata(intf); @@ -656,6 +663,7 @@ return usbnet_resume(intf); } +#endif static int ax88772_init_mdio(struct usbnet *dev) { @@ -1431,9 +1439,14 @@ .name = DRIVER_NAME, .id_table = products, .probe = usbnet_probe, - .suspend = asix_suspend, - .resume = asix_resume, - .reset_resume = asix_resume, + /* + * Changing .suspend, .resume and .reset_resume + * from asix implementation to standard usbnet implementation + * for compability 3.12 and 4.9 kernel versions. + */ + .suspend = usbnet_suspend, + .resume = usbnet_resume, + .reset_resume = usbnet_resume, .disconnect = usbnet_disconnect, .supports_autosuspend = 1, .disable_hub_initiated_lpm = 1,