lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: rtl8192e: Clean up rtl8192_qos_association_resp()

Browse Source 
Fix whitespace, remove dead code.

Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Mike McCormack
2010-09-24 18:38:59 +09:00
committed by Greg Kroah-Hartman
parent f8acdc3d5c
commit b72cb94f4a
1 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
drivers/staging/rtl8192e/r8192E_core.c
View File

@@ -1872,53 +1872,49 @@ static int rtl8192_handle_beacon(struct net_device * dev,
static int rtl8192_qos_association_resp(struct r8192_priv *priv, static int rtl8192_qos_association_resp(struct r8192_priv *priv,
struct ieee80211_network *network) struct ieee80211_network *network)
{ {
int ret = 0; int ret = 0;
unsigned long flags; unsigned long flags;
u32 size = sizeof(struct ieee80211_qos_parameters); u32 size = sizeof(struct ieee80211_qos_parameters);
int set_qos_param = 0; int set_qos_param = 0;
if ((priv == NULL) || (network == NULL)) if ((priv == NULL) || (network == NULL))
return ret; return ret;
if(priv->ieee80211->state !=IEEE80211_LINKED) if (priv->ieee80211->state != IEEE80211_LINKED)
return ret; return ret;
if ((priv->ieee80211->iw_mode != IW_MODE_INFRA)) if ((priv->ieee80211->iw_mode != IW_MODE_INFRA))
return ret; return ret;
spin_lock_irqsave(&priv->ieee80211->lock, flags); spin_lock_irqsave(&priv->ieee80211->lock, flags);
if(network->flags & NETWORK_HAS_QOS_PARAMETERS) { if (network->flags & NETWORK_HAS_QOS_PARAMETERS) {
memcpy(&priv->ieee80211->current_network.qos_data.parameters, memcpy(&priv->ieee80211->current_network.qos_data.parameters,
&network->qos_data.parameters, &network->qos_data.parameters,
sizeof(struct ieee80211_qos_parameters)); sizeof(struct ieee80211_qos_parameters));
priv->ieee80211->current_network.qos_data.active = 1; priv->ieee80211->current_network.qos_data.active = 1;
#if 0 set_qos_param = 1;
if((priv->ieee80211->current_network.qos_data.param_count != /* update qos parameter for current network */
network->qos_data.param_count)) priv->ieee80211->current_network.qos_data.old_param_count =
#endif priv->ieee80211->current_network.qos_data.param_count;
{ priv->ieee80211->current_network.qos_data.param_count =
set_qos_param = 1; network->qos_data.param_count;
/* update qos parameter for current network */
priv->ieee80211->current_network.qos_data.old_param_count = } else {
priv->ieee80211->current_network.qos_data.param_count;
priv->ieee80211->current_network.qos_data.param_count =
network->qos_data.param_count;
}
} else {
memcpy(&priv->ieee80211->current_network.qos_data.parameters, memcpy(&priv->ieee80211->current_network.qos_data.parameters,
&def_qos_parameters, size); &def_qos_parameters, size);
priv->ieee80211->current_network.qos_data.active = 0; priv->ieee80211->current_network.qos_data.active = 0;
priv->ieee80211->current_network.qos_data.supported = 0; priv->ieee80211->current_network.qos_data.supported = 0;
set_qos_param = 1; set_qos_param = 1;
} }
spin_unlock_irqrestore(&priv->ieee80211->lock, flags); spin_unlock_irqrestore(&priv->ieee80211->lock, flags);
RT_TRACE(COMP_QOS, "%s: network->flags = %d,%d\n",__FUNCTION__,network->flags ,priv->ieee80211->current_network.qos_data.active); RT_TRACE(COMP_QOS, "%s: network->flags = %d,%d\n", __FUNCTION__,
network->flags, priv->ieee80211->current_network.qos_data.active);
if (set_qos_param == 1) if (set_qos_param == 1)
queue_work(priv->priv_wq, &priv->qos_activate); queue_work(priv->priv_wq, &priv->qos_activate);
return ret; return ret;
} }