[PATCH v1 1/2] Revert "usb: gadget: u_ether: Re-attach netif device to mirror detachment"

[PATCH v1 1/2] Revert "usb: gadget: u_ether: Re-attach netif device to mirror detachment"

[Ferry Toth]

This reverts commit 76c945730cdffb572c7767073cc6515fd3f646b4.

Prerequisite revert for the reverting of the original commit f49449fbc21e.

Fixes: 76c945730cdf ("usb: gadget: u_ether: Re-attach netif device to mirror detachment")
Fixes: f49449fbc21e ("usb: gadget: u_ether: Replace netif_stop_queue with netif_device_detach")
Reported-by: Ferry Toth <fntoth@gmail.com>
Cc: stable@vger.kernel.org
---
 drivers/usb/gadget/function/u_ether.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c
index 11dd0b9e847f..aa0511c3a62c 100644
--- a/drivers/usb/gadget/function/u_ether.c
+++ b/drivers/usb/gadget/function/u_ether.c
@@ -1163,8 +1163,6 @@ struct net_device *gether_connect(struct gether *link)
 		if (netif_running(dev->net))
 			eth_start(dev, GFP_ATOMIC);
 
-		netif_device_attach(dev->net);
-
 	/* on error, disable any endpoints  */
 	} else {
 		(void) usb_ep_disable(link->out_ep);
-- 
2.43.0

Re: [PATCH v1 1/2] Revert "usb: gadget: u_ether: Re-attach netif device to mirror detachment"

[Greg Kroah-Hartman]

On Thu, Jun 06, 2024 at 11:02:31PM +0200, Ferry Toth wrote:
> This reverts commit 76c945730cdffb572c7767073cc6515fd3f646b4.
> 
> Prerequisite revert for the reverting of the original commit f49449fbc21e.
> 
> Fixes: 76c945730cdf ("usb: gadget: u_ether: Re-attach netif device to mirror detachment")
> Fixes: f49449fbc21e ("usb: gadget: u_ether: Replace netif_stop_queue with netif_device_detach")
> Reported-by: Ferry Toth <fntoth@gmail.com>
> Cc: stable@vger.kernel.org
> ---
>  drivers/usb/gadget/function/u_ether.c | 2 --
>  1 file changed, 2 deletions(-)

You have to sign-off on your changes, otherwise the tools will reject
them (as will I).  Please fix up for both of these and resend.

thanks,

greg k-h

Re: [PATCH v1 1/2] Revert "usb: gadget: u_ether: Re-attach netif device to mirror detachment"

[Ferry Toth]

Hi Greg,

Op 20-06-2024 om 19:35 schreef Greg Kroah-Hartman:
> On Thu, Jun 06, 2024 at 11:02:31PM +0200, Ferry Toth wrote:
>> This reverts commit 76c945730cdffb572c7767073cc6515fd3f646b4.
>>
>> Prerequisite revert for the reverting of the original commit f49449fbc21e.
>>
>> Fixes: 76c945730cdf ("usb: gadget: u_ether: Re-attach netif device to mirror detachment")
>> Fixes: f49449fbc21e ("usb: gadget: u_ether: Replace netif_stop_queue with netif_device_detach")
>> Reported-by: Ferry Toth <fntoth@gmail.com>
>> Cc: stable@vger.kernel.org
>> ---
>>   drivers/usb/gadget/function/u_ether.c | 2 --
>>   1 file changed, 2 deletions(-)
> 
> You have to sign-off on your changes, otherwise the tools will reject
> them (as will I).  Please fix up for both of these and resend.

Oops, I knew that. Just didn't notice SoB wasn't auto added.
I'll that up, sorry.

> thanks,
> 
> greg k-h

[PATCH v1 2/2] Revert "usb: gadget: u_ether: Replace netif_stop_queue with netif_device_detach"

[Ferry Toth]

This reverts commit f49449fbc21e7e9550a5203902d69c8ae7dfd918.

This commit breaks u_ether on some setups (at least Merrifield). The fix
"usb: gadget: u_ether: Re-attach netif device to mirror detachment" party
restores u-ether. However the netif usb: remains up even usb is switched
from device to host mode. This creates problems for user space as the
interface remains in the routing table while not realy present and network
managers (connman) not detecting a network change.

Various attempts to find the root cause were unsuccesful up to now. Therefore
revert until a solution is found.

Link: https://lore.kernel.org/linux-usb/20231006141231.7220-1-hgajjar@de.adit-jv.com/
Reported-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Reported-by: Ferry Toth <fntoth@gmail.com>
Fixes: f49449fbc21e ("usb: gadget: u_ether: Replace netif_stop_queue with netif_device_detach")
Cc: stable@vger.kernel.org
---
 drivers/usb/gadget/function/u_ether.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c
index aa0511c3a62c..95191083b455 100644
--- a/drivers/usb/gadget/function/u_ether.c
+++ b/drivers/usb/gadget/function/u_ether.c
@@ -1200,7 +1200,7 @@ void gether_disconnect(struct gether *link)
 
 	DBG(dev, "%s\n", __func__);
 
-	netif_device_detach(dev->net);
+	netif_stop_queue(dev->net);
 	netif_carrier_off(dev->net);
 
 	/* disable endpoints, forcing (synchronous) completion
-- 
2.43.0