libertas: remove priv->capability
PATCH 1/1 libertas: remove priv->capability
This variable was once set to WLAN_CAPABILITY_SHORT_PREAMBLE and there's no code that could change the variable to something else. Therefore it seems this is not necessary :-)
Signed-off-by Holger Schurig <[email protected]>
drivers/net/wireless/libertas/assoc.c +3 -10
@@ -807,8 +807,7 @@ static int lbs_try_associate(struct lbs_ }/* Use short preamble only when both the BSS and firmware support it */ -if ((priv->capability &WLAN_CAPABILITY_SHORT_PREAMBLE ) && - (assoc_req->bss.capability &WLAN_CAPABILITY_SHORT_PREAMBLE )) +if (assoc_req->bss.capability &WLAN_CAPABILITY_SHORT_PREAMBLE ) preamble =RADIO_PREAMBLE_SHORT ; ret =lbs_set_radio (priv, preamble,1 );
@@ -939,8 +938,7 @@ static int lbs_adhoc_join(struct lbs_pri }/* Use short preamble only when both the BSS and firmware support it */ -if ((priv->capability &WLAN_CAPABILITY_SHORT_PREAMBLE ) && - (bss->capability &WLAN_CAPABILITY_SHORT_PREAMBLE )) { +if (bss->capability &WLAN_CAPABILITY_SHORT_PREAMBLE ) {lbs_deb_join ("AdhocJoin: Short preamble\n" ); preamble =RADIO_PREAMBLE_SHORT ; }
@@ -1049,7 +1047,7 @@ static int lbs_adhoc_start(struct lbs_pr struct assoc_request *assoc_req) {struct cmd_ds_802_11_ad_hoc_start cmd; -u8 preamble =RADIO_PREAMBLE_LONG ; +u8 preamble =RADIO_PREAMBLE_SHORT ;size_t ratesize =0 ;u16 tmpcap =0 ;int ret =0 ;
@@ -1057,11 +1055,6 @@ static int lbs_adhoc_start(struct lbs_prlbs_deb_enter (LBS_DEB_ASSOC ); -if (priv->capability &WLAN_CAPABILITY_SHORT_PREAMBLE ) { -lbs_deb_join ("ADHOC_START: Will use short preamble\n" ); - preamble =RADIO_PREAMBLE_SHORT ; - } - ret =lbs_set_radio (priv, preamble,1 );if (ret) goto out;
drivers/net/wireless/libertas/cmd.c +0 -3
@@ -842,9 +842,6 @@ int lbs_set_radio(struct lbs_private *prif (priv->fwrelease <0x09000000 ) {switch (preamble) {case RADIO_PREAMBLE_SHORT : -if (!(priv->capability &WLAN_CAPABILITY_SHORT_PREAMBLE )) - goto out; -/* Fall through */ case RADIO_PREAMBLE_AUTO :case RADIO_PREAMBLE_LONG : cmd.control =cpu_to_le16 (preamble);
drivers/net/wireless/libertas/main.c +0 -1
@@ -839,7 +839,6 @@ static int lbs_init_adapter(struct lbs_p priv->mac_control =CMD_ACT_MAC_RX_ON |CMD_ACT_MAC_TX_ON ; priv->radio_on =1 ; priv->enablehwauto =1 ; - priv->capability =WLAN_CAPABILITY_SHORT_PREAMBLE ; priv->psmode =LBS802_11POWERMODECAM ; priv->psstate =PS_STATE_FULL_POWER ; priv->is_deep_sleep =0 ;
Signature · 1 line
http://www.holgerschurig.de
This variable was once set to WLAN_CAPABILITY_SHORT_PREAMBLE and there's no code that could change the variable to something else. Therefore it seems this is not necessary :-)
Signed-off-by Holger Schurig <[email protected]>
---
v2: forgot to remove "capability" it from struct lbs_private
drivers/net/wireless/libertas/dev.h +0 -1
@@ -175,7 +175,6 @@ struct lbs_private {struct bss_descriptor *networks;struct assoc_request * pending_assoc_req;struct assoc_request * in_progress_assoc_req; -u16 capability;uint16_t enablehwauto;uint16_t ratebitmap;
drivers/net/wireless/libertas/assoc.c +3 -10
@@ -807,8 +807,7 @@ static int lbs_try_associate(struct lbs_ }/* Use short preamble only when both the BSS and firmware support it */ -if ((priv->capability &WLAN_CAPABILITY_SHORT_PREAMBLE ) && - (assoc_req->bss.capability &WLAN_CAPABILITY_SHORT_PREAMBLE )) +if (assoc_req->bss.capability &WLAN_CAPABILITY_SHORT_PREAMBLE ) preamble =RADIO_PREAMBLE_SHORT ; ret =lbs_set_radio (priv, preamble,1 );
@@ -939,8 +938,7 @@ static int lbs_adhoc_join(struct lbs_pri }/* Use short preamble only when both the BSS and firmware support it */ -if ((priv->capability &WLAN_CAPABILITY_SHORT_PREAMBLE ) && - (bss->capability &WLAN_CAPABILITY_SHORT_PREAMBLE )) { +if (bss->capability &WLAN_CAPABILITY_SHORT_PREAMBLE ) {lbs_deb_join ("AdhocJoin: Short preamble\n" ); preamble =RADIO_PREAMBLE_SHORT ; }
@@ -1049,7 +1047,7 @@ static int lbs_adhoc_start(struct lbs_pr struct assoc_request *assoc_req) {struct cmd_ds_802_11_ad_hoc_start cmd; -u8 preamble =RADIO_PREAMBLE_LONG ; +u8 preamble =RADIO_PREAMBLE_SHORT ;size_t ratesize =0 ;u16 tmpcap =0 ;int ret =0 ;
@@ -1057,11 +1055,6 @@ static int lbs_adhoc_start(struct lbs_prlbs_deb_enter (LBS_DEB_ASSOC ); -if (priv->capability &WLAN_CAPABILITY_SHORT_PREAMBLE ) { -lbs_deb_join ("ADHOC_START: Will use short preamble\n" ); - preamble =RADIO_PREAMBLE_SHORT ; - } - ret =lbs_set_radio (priv, preamble,1 );if (ret) goto out;
drivers/net/wireless/libertas/cmd.c +0 -3
@@ -842,9 +842,6 @@ int lbs_set_radio(struct lbs_private *prif (priv->fwrelease <0x09000000 ) {switch (preamble) {case RADIO_PREAMBLE_SHORT : -if (!(priv->capability &WLAN_CAPABILITY_SHORT_PREAMBLE )) - goto out; -/* Fall through */ case RADIO_PREAMBLE_AUTO :case RADIO_PREAMBLE_LONG : cmd.control =cpu_to_le16 (preamble);
drivers/net/wireless/libertas/main.c +0 -1
@@ -839,7 +839,6 @@ static int lbs_init_adapter(struct lbs_p priv->mac_control =CMD_ACT_MAC_RX_ON |CMD_ACT_MAC_TX_ON ; priv->radio_on =1 ; priv->enablehwauto =1 ; - priv->capability =WLAN_CAPABILITY_SHORT_PREAMBLE ; priv->psmode =LBS802_11POWERMODECAM ; priv->psstate =PS_STATE_FULL_POWER ; priv->is_deep_sleep =0 ;
Signature · 1 line
http://www.holgerschurig.de