[PATCH] hostap: Revert a toxic part of the conversion to net_device_ops

[PATCH] hostap: Revert a toxic part of the conversion to net_device_ops

[Martin Decky]

From: Martin Decky <martin@decky.cz>

As the hostap driver was converted to use net_device_ops, a mistake was 
made in hostap_main.c (commit 5ae4efbcd2611562a8b93596be034e63495706a5). 
Originally, the tx_queue_len was set to 0 for every other interface than 
HOSTAP_INTERFACE_MASTER, but the new fragment of code sets tx_queue_len to 
0 only for HOSTAP_INTERFACE_MASTER. The opposite of the previous 
behavior makes the driver to drop all packets in AP mode.

Change the way 0 is assigned to tx_queue_len according to the original 
logic.

Signed-off-by: Martin Decky <martin@decky.cz>
----
diff -Naurp linux-2.6.30.orig/drivers/net/wireless/hostap/hostap_main.c linux-2.6.30/drivers/net/wireless/hostap/hostap_main.c
--- linux-2.6.30.orig/drivers/net/wireless/hostap/hostap_main.c	2009-06-10 05:05:27.000000000 +0200
+++ linux-2.6.30/drivers/net/wireless/hostap/hostap_main.c	2009-09-08 11:11:23.892816045 +0200
@@ -875,15 +875,16 @@ void hostap_setup_dev(struct net_device 
 
 	switch(type) {
 	case HOSTAP_INTERFACE_AP:
+		dev->tx_queue_len = 0;	/* use main radio device queue */
 		dev->netdev_ops = &hostap_mgmt_netdev_ops;
 		dev->type = ARPHRD_IEEE80211;
 		dev->header_ops = &hostap_80211_ops;
 		break;
 	case HOSTAP_INTERFACE_MASTER:
-		dev->tx_queue_len = 0;	/* use main radio device queue */
 		dev->netdev_ops = &hostap_master_ops;
 		break;
 	default:
+		dev->tx_queue_len = 0;	/* use main radio device queue */
 		dev->netdev_ops = &hostap_netdev_ops;
 	}
 

Re: [PATCH] hostap: Revert a toxic part of the conversion to net_device_ops

[David Miller]

From: Martin Decky <martin@decky.cz>
Date: Thu, 10 Sep 2009 03:44:47 +0200 (CEST)

Thanks, linux-wireless CC:'d, please CC: them on all wireless
patches in the future.

> From: Martin Decky <martin@decky.cz>
> 
> As the hostap driver was converted to use net_device_ops, a mistake was 
> made in hostap_main.c (commit 5ae4efbcd2611562a8b93596be034e63495706a5). 
> Originally, the tx_queue_len was set to 0 for every other interface than 
> HOSTAP_INTERFACE_MASTER, but the new fragment of code sets tx_queue_len to 
> 0 only for HOSTAP_INTERFACE_MASTER. The opposite of the previous 
> behavior makes the driver to drop all packets in AP mode.
> 
> Change the way 0 is assigned to tx_queue_len according to the original 
> logic.
> 
> Signed-off-by: Martin Decky <martin@decky.cz>

> ----
> diff -Naurp linux-2.6.30.orig/drivers/net/wireless/hostap/hostap_main.c linux-2.6.30/drivers/net/wireless/hostap/hostap_main.c
> --- linux-2.6.30.orig/drivers/net/wireless/hostap/hostap_main.c	2009-06-10 05:05:27.000000000 +0200
> +++ linux-2.6.30/drivers/net/wireless/hostap/hostap_main.c	2009-09-08 11:11:23.892816045 +0200
> @@ -875,15 +875,16 @@ void hostap_setup_dev(struct net_device 
>  
>  	switch(type) {
>  	case HOSTAP_INTERFACE_AP:
> +		dev->tx_queue_len = 0;	/* use main radio device queue */
>  		dev->netdev_ops = &hostap_mgmt_netdev_ops;
>  		dev->type = ARPHRD_IEEE80211;
>  		dev->header_ops = &hostap_80211_ops;
>  		break;
>  	case HOSTAP_INTERFACE_MASTER:
> -		dev->tx_queue_len = 0;	/* use main radio device queue */
>  		dev->netdev_ops = &hostap_master_ops;
>  		break;
>  	default:
> +		dev->tx_queue_len = 0;	/* use main radio device queue */
>  		dev->netdev_ops = &hostap_netdev_ops;
>  	}
>  
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/