2009-10-19 13:04:57

by Holger Schurig

Subject: [PATCH] libertas: move SIOCGIWAP calls to wext.c

This removes to calls to SIOCGIWAP with an all-bytes-zero AP into wext.c.

Signed-off-by: Holger Schurig <[email protected]>

---
Less and less files now depend on WEXT :-)

--- linux-wl.orig/drivers/net/wireless/libertas/cmdresp.c
+++ linux-wl/drivers/net/wireless/libertas/cmdresp.c
@@ -27,23 +27,18 @@
*/
void lbs_mac_event_disconnected(struct lbs_private *priv)
{
- union iwreq_data wrqu;
-
if (priv->connect_status != LBS_CONNECTED)
return;

lbs_deb_enter(LBS_DEB_ASSOC);

- memset(wrqu.ap_addr.sa_data, 0x00, ETH_ALEN);
- wrqu.ap_addr.sa_family = ARPHRD_ETHER;

/*
* Cisco AP sends EAP failure and de-auth in less than 0.5 ms.
* It causes problem in the Supplicant
*/
-
msleep_interruptible(1000);
- wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
+ lbs_send_disconnect_notification(priv);

/* report disconnect to upper layer */
netif_stop_queue(priv->dev);
--- linux-wl.orig/drivers/net/wireless/libertas/main.c
+++ linux-wl/drivers/net/wireless/libertas/main.c
@@ -1227,7 +1227,6 @@
void lbs_remove_card(struct lbs_private *priv)
{
struct net_device *dev = priv->dev;
- union iwreq_data wrqu;

lbs_deb_enter(LBS_DEB_MAIN);

@@ -1252,9 +1251,7 @@
lbs_ps_wakeup(priv, CMD_OPTION_WAITFORRSP);
}

- memset(wrqu.ap_addr.sa_data, 0xaa, ETH_ALEN);
- wrqu.ap_addr.sa_family = ARPHRD_ETHER;
- wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
+ lbs_send_disconnect_notification(priv);

if (priv->is_deep_sleep) {
priv->is_deep_sleep = 0;
--- linux-wl.orig/drivers/net/wireless/libertas/wext.c
+++ linux-wl/drivers/net/wireless/libertas/wext.c
@@ -45,6 +45,15 @@
priv->pending_assoc_req = NULL;
}

+void lbs_send_disconnect_notification(struct lbs_private *priv)
+{
+ union iwreq_data wrqu;
+
+ memset(wrqu.ap_addr.sa_data, 0x00, ETH_ALEN);
+ wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+ wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
+}
+
void lbs_send_iwevcustom_event(struct lbs_private *priv, s8 *str)
{
union iwreq_data iwrq;

--
http://www.holgerschurig.de

2009-10-20 12:39:51

by Holger Schurig

Subject: [PATCH, v2] libertas: move SIOCGIWAP calls to wext.c

Signed-off-by: Holger Schurig <[email protected]>

---
v1: Less and less files now depend on WEXT :-)
v2: fix compilation issue

--- linux-wl.orig/drivers/net/wireless/libertas/cmdresp.c
+++ linux-wl/drivers/net/wireless/libertas/cmdresp.c
@@ -27,23 +27,18 @@
*/
void lbs_mac_event_disconnected(struct lbs_private *priv)
{
- union iwreq_data wrqu;
-
if (priv->connect_status != LBS_CONNECTED)
return;

lbs_deb_enter(LBS_DEB_ASSOC);

- memset(wrqu.ap_addr.sa_data, 0x00, ETH_ALEN);
- wrqu.ap_addr.sa_family = ARPHRD_ETHER;

/*
* Cisco AP sends EAP failure and de-auth in less than 0.5 ms.
* It causes problem in the Supplicant
*/
-
msleep_interruptible(1000);
- wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
+ lbs_send_disconnect_notification(priv);

/* report disconnect to upper layer */
netif_stop_queue(priv->dev);
--- linux-wl.orig/drivers/net/wireless/libertas/main.c
+++ linux-wl/drivers/net/wireless/libertas/main.c
@@ -1227,7 +1227,6 @@
void lbs_remove_card(struct lbs_private *priv)
{
struct net_device *dev = priv->dev;
- union iwreq_data wrqu;

lbs_deb_enter(LBS_DEB_MAIN);

@@ -1252,9 +1251,7 @@
lbs_ps_wakeup(priv, CMD_OPTION_WAITFORRSP);
}

- memset(wrqu.ap_addr.sa_data, 0xaa, ETH_ALEN);
- wrqu.ap_addr.sa_family = ARPHRD_ETHER;
- wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
+ lbs_send_disconnect_notification(priv);

if (priv->is_deep_sleep) {
priv->is_deep_sleep = 0;
--- linux-wl.orig/drivers/net/wireless/libertas/wext.c
+++ linux-wl/drivers/net/wireless/libertas/wext.c
@@ -45,6 +45,15 @@
priv->pending_assoc_req = NULL;
}

+void lbs_send_disconnect_notification(struct lbs_private *priv)
+{
+ union iwreq_data wrqu;
+
+ memset(wrqu.ap_addr.sa_data, 0x00, ETH_ALEN);
+ wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+ wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
+}
+
void lbs_send_iwevcustom_event(struct lbs_private *priv, s8 *str)
{
union iwreq_data iwrq;
--- linux-wl.orig/drivers/net/wireless/libertas/wext.h
+++ linux-wl/drivers/net/wireless/libertas/wext.h
@@ -4,6 +4,7 @@
#ifndef _LBS_WEXT_H_
#define _LBS_WEXT_H_

+void lbs_send_disconnect_notification(struct lbs_private *priv);
void lbs_send_iwevcustom_event(struct lbs_private *priv, s8 *str);

extern struct iw_handler_def lbs_handler_def;


--
http://www.holgerschurig.de

2009-10-20 15:53:18

by Randy Dunlap

Subject: Re: [PATCH, v2] libertas: move SIOCGIWAP calls to wext.c

On Tue, 20 Oct 2009 14:39:31 +0200 Holger Schurig wrote:

> Signed-off-by: Holger Schurig <[email protected]>
>
> ---
> v1: Less and less files now depend on WEXT :-)
> v2: fix compilation issue

You should say what compilation issue it fixes.

> --- linux-wl.orig/drivers/net/wireless/libertas/cmdresp.c
> +++ linux-wl/drivers/net/wireless/libertas/cmdresp.c
> @@ -27,23 +27,18 @@
> */
> void lbs_mac_event_disconnected(struct lbs_private *priv)
> {
> - union iwreq_data wrqu;
> -
> if (priv->connect_status != LBS_CONNECTED)
> return;
>
> lbs_deb_enter(LBS_DEB_ASSOC);
>
> - memset(wrqu.ap_addr.sa_data, 0x00, ETH_ALEN);
> - wrqu.ap_addr.sa_family = ARPHRD_ETHER;
>
> /*
> * Cisco AP sends EAP failure and de-auth in less than 0.5 ms.
> * It causes problem in the Supplicant
> */
> -
> msleep_interruptible(1000);
> - wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
> + lbs_send_disconnect_notification(priv);
>
> /* report disconnect to upper layer */
> netif_stop_queue(priv->dev);
> --- linux-wl.orig/drivers/net/wireless/libertas/main.c
> +++ linux-wl/drivers/net/wireless/libertas/main.c
> @@ -1227,7 +1227,6 @@
> void lbs_remove_card(struct lbs_private *priv)
> {
> struct net_device *dev = priv->dev;
> - union iwreq_data wrqu;
>
> lbs_deb_enter(LBS_DEB_MAIN);
>
> @@ -1252,9 +1251,7 @@
> lbs_ps_wakeup(priv, CMD_OPTION_WAITFORRSP);
> }
>
> - memset(wrqu.ap_addr.sa_data, 0xaa, ETH_ALEN);
> - wrqu.ap_addr.sa_family = ARPHRD_ETHER;
> - wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
> + lbs_send_disconnect_notification(priv);
>
> if (priv->is_deep_sleep) {
> priv->is_deep_sleep = 0;
> --- linux-wl.orig/drivers/net/wireless/libertas/wext.c
> +++ linux-wl/drivers/net/wireless/libertas/wext.c
> @@ -45,6 +45,15 @@
> priv->pending_assoc_req = NULL;
> }
>
> +void lbs_send_disconnect_notification(struct lbs_private *priv)
> +{
> + union iwreq_data wrqu;
> +
> + memset(wrqu.ap_addr.sa_data, 0x00, ETH_ALEN);
> + wrqu.ap_addr.sa_family = ARPHRD_ETHER;
> + wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
> +}
> +
> void lbs_send_iwevcustom_event(struct lbs_private *priv, s8 *str)
> {
> union iwreq_data iwrq;
> --- linux-wl.orig/drivers/net/wireless/libertas/wext.h
> +++ linux-wl/drivers/net/wireless/libertas/wext.h
> @@ -4,6 +4,7 @@
> #ifndef _LBS_WEXT_H_
> #define _LBS_WEXT_H_
>
> +void lbs_send_disconnect_notification(struct lbs_private *priv);
> void lbs_send_iwevcustom_event(struct lbs_private *priv, s8 *str);
>
> extern struct iw_handler_def lbs_handler_def;
>
>
> --


---
~Randy