libertas: access mesh_dev more carefully

[Dan Williams]

On Wed, 2007-06-13 at 15:15 +0200, Holger Schurig wrote:
> >From 056e5f71a27c75c358f0dd46b2a51cde3e046c41 Mon Sep 17 00:00:00 2001
> From: Holger Schurig <hs4233 at mail.mn-solutions.de>
> Date: Wed, 13 Jun 2007 15:07:35 +0200
> Subject: [PATCH] libertas: access mesh_dev more carefully
> 
> The CF/SDIO firmware doesn't support Mesh, so priv->mesh_dev is
> NULL there. Protect all accesses.
> 
> Signed-off-by: Holger Schurig <hs4233 at mail.mn-solutions.de>

Committed, thanks.

>  drivers/net/wireless/libertas/join.c |   12 ++++++++----
>  drivers/net/wireless/libertas/main.c |   16 ++++++++++------
>  drivers/net/wireless/libertas/scan.c |   12 ++++++++----
>  drivers/net/wireless/libertas/tx.c   |   12 ++++++++----
>  4 files changed, 34 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/net/wireless/libertas/join.c b/drivers/net/wireless/libertas/join.c
> index 78f7b79..b486ab0 100644
> --- a/drivers/net/wireless/libertas/join.c
> +++ b/drivers/net/wireless/libertas/join.c
> @@ -739,8 +739,10 @@ int libertas_ret_80211_associate(wlan_private * priv,
>  	netif_carrier_on(priv->dev);
>  	netif_wake_queue(priv->dev);
>  
> -	netif_carrier_on(priv->mesh_dev);
> -	netif_wake_queue(priv->mesh_dev);
> +	if (priv->mesh_dev) {
> +		netif_carrier_on(priv->mesh_dev);
> +		netif_wake_queue(priv->mesh_dev);
> +	}
>  
>  	lbs_deb_join("ASSOC_RESP: Associated \n");
>  
> @@ -827,8 +829,10 @@ int libertas_ret_80211_ad_hoc_start(wlan_private * priv,
>  	netif_carrier_on(priv->dev);
>  	netif_wake_queue(priv->dev);
>  
> -	netif_carrier_on(priv->mesh_dev);
> -	netif_wake_queue(priv->mesh_dev);
> +	if (priv->mesh_dev) {
> +		netif_carrier_on(priv->mesh_dev);
> +		netif_wake_queue(priv->mesh_dev);
> +	}
>  
>  	memset(&wrqu, 0, sizeof(wrqu));
>  	memcpy(wrqu.ap_addr.sa_data, adapter->curbssparams.bssid, ETH_ALEN);
> diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
> index 1e4a512..687b346 100644
> --- a/drivers/net/wireless/libertas/main.c
> +++ b/drivers/net/wireless/libertas/main.c
> @@ -298,10 +298,12 @@ static int libertas_dev_open(struct net_device *dev)
>  
>  	if (adapter->connect_status == LIBERTAS_CONNECTED) {
>  		netif_carrier_on(priv->dev);
> -		netif_carrier_on(priv->mesh_dev);
> +		if (priv->mesh_dev)
> +			netif_carrier_on(priv->mesh_dev);
>  	} else {
>  		netif_carrier_off(priv->dev);
> -		netif_carrier_off(priv->mesh_dev);
> +		if (priv->mesh_dev)
> +			netif_carrier_off(priv->mesh_dev);
>  	}
>  
>  	lbs_deb_leave(LBS_DEB_NET);
> @@ -408,7 +410,8 @@ static int libertas_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
>  	}
>  
>  	netif_stop_queue(priv->dev);
> -	netif_stop_queue(priv->mesh_dev);
> +	if (priv->mesh_dev)
> +		netif_stop_queue(priv->mesh_dev);
>  
>  	if (libertas_process_tx(priv, skb) == 0)
>  		dev->trans_start = jiffies;
> @@ -474,7 +477,8 @@ static void libertas_tx_timeout(struct net_device *dev)
>  			wake_up_interruptible(&priv->waitq);
>  	} else if (priv->adapter->connect_status == LIBERTAS_CONNECTED) {
>  		netif_wake_queue(priv->dev);
> -		netif_wake_queue(priv->mesh_dev);
> +		if (priv->mesh_dev)
> +			netif_wake_queue(priv->mesh_dev);
>  	}
>  
>  	lbs_deb_leave(LBS_DEB_TX);
> @@ -1256,7 +1260,6 @@ int libertas_add_mesh(wlan_private *priv, struct device *dev)
>  	ret = 0;
>  	goto done;
>  
> -
>  err_unregister:
>  	unregister_netdev(mesh_dev);
>  
> @@ -1456,7 +1459,8 @@ void libertas_interrupt(struct net_device *dev)
>  	if (priv->adapter->psstate == PS_STATE_SLEEP) {
>  		priv->adapter->psstate = PS_STATE_AWAKE;
>  		netif_wake_queue(dev);
> -		netif_wake_queue(priv->mesh_dev);
> +		if (priv->mesh_dev)
> +			netif_wake_queue(priv->mesh_dev);
>  	}
>  
>  	wake_up_interruptible(&priv->waitq);
> diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
> index a43e530..9315c9f 100644
> --- a/drivers/net/wireless/libertas/scan.c
> +++ b/drivers/net/wireless/libertas/scan.c
> @@ -793,8 +793,10 @@ int wlan_scan_networks(wlan_private * priv,
>  	if (!scancurrentchanonly) {
>  		netif_stop_queue(priv->dev);
>  		netif_carrier_off(priv->dev);
> -		netif_stop_queue(priv->mesh_dev);
> -		netif_carrier_off(priv->mesh_dev);
> +		if (priv->mesh_dev) {
> +			netif_stop_queue(priv->mesh_dev);
> +			netif_carrier_off(priv->mesh_dev);
> +		}
>  	}
>  
>  	ret = wlan_scan_channel_list(priv,
> @@ -820,8 +822,10 @@ int wlan_scan_networks(wlan_private * priv,
>  	if (priv->adapter->connect_status == LIBERTAS_CONNECTED) {
>  		netif_carrier_on(priv->dev);
>  		netif_wake_queue(priv->dev);
> -		netif_carrier_on(priv->mesh_dev);
> -		netif_wake_queue(priv->mesh_dev);
> +		if (priv->mesh_dev) {
> +			netif_carrier_on(priv->mesh_dev);
> +			netif_wake_queue(priv->mesh_dev);
> +		}
>  	}
>  
>  out:
> diff --git a/drivers/net/wireless/libertas/tx.c b/drivers/net/wireless/libertas/tx.c
> index c227102..7c38301 100644
> --- a/drivers/net/wireless/libertas/tx.c
> +++ b/drivers/net/wireless/libertas/tx.c
> @@ -159,7 +159,8 @@ done:
>  		skb_orphan(skb);
>  		/* stop processing outgoing pkts */
>  		netif_stop_queue(priv->dev);
> -		netif_stop_queue(priv->mesh_dev);
> +		if (priv->mesh_dev)
> +			netif_stop_queue(priv->mesh_dev);
>  		/* freeze any packets already in our queues */
>  		priv->adapter->TxLockFlag = 1;
>  	} else {
> @@ -198,10 +199,12 @@ static void wlan_tx_queue(wlan_private *priv, struct sk_buff *skb)
>  	adapter->tx_queue_ps[adapter->tx_queue_idx++] = skb;
>  	if (adapter->tx_queue_idx == NR_TX_QUEUE) {
>  		netif_stop_queue(priv->dev);
> -		netif_stop_queue(priv->mesh_dev);
> +		if (priv->mesh_dev)
> +			netif_stop_queue(priv->mesh_dev);
>  	} else {
>  		netif_start_queue(priv->dev);
> -		netif_start_queue(priv->mesh_dev);
> +		if (priv->mesh_dev)
> +			netif_start_queue(priv->mesh_dev);
>  	}
>  
>  	spin_unlock(&adapter->txqueue_lock);
> @@ -285,7 +288,8 @@ void libertas_send_tx_feedback(wlan_private * priv)
>  	priv->adapter->TxLockFlag = 0;
>  	if (priv->adapter->connect_status == LIBERTAS_CONNECTED) {
>  		netif_wake_queue(priv->dev);
> -		netif_wake_queue(priv->mesh_dev);
> +		if (priv->mesh_dev)
> +			netif_wake_queue(priv->mesh_dev);
>  	}
>  }
>  EXPORT_SYMBOL_GPL(libertas_send_tx_feedback);