Commit 84f26105 authored by Ana Rey's avatar Ana Rey Committed by Peter P Waskiewicz Jr

staging: rtl8187se: Fix "code indent should use tabs where possible" error

Fix checkpatch.pl error:
ERROR: code indent should use tabs where possible

Also fix some problems with tabs in an if-statement.
Signed-off-by: default avatarAna Rey <anarey@gmail.com>
Signed-off-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
parent 03854f39
...@@ -269,11 +269,11 @@ ieee80211_disassociate_skb(struct ieee80211_network *beacon, ...@@ -269,11 +269,11 @@ ieee80211_disassociate_skb(struct ieee80211_network *beacon,
void SendDisassociation(struct ieee80211_device *ieee, u8 *asSta, u8 asRsn) void SendDisassociation(struct ieee80211_device *ieee, u8 *asSta, u8 asRsn)
{ {
struct ieee80211_network *beacon = &ieee->current_network; struct ieee80211_network *beacon = &ieee->current_network;
struct sk_buff *skb; struct sk_buff *skb;
skb = ieee80211_disassociate_skb(beacon, ieee, asRsn); skb = ieee80211_disassociate_skb(beacon, ieee, asRsn);
if (skb) if (skb)
softmac_mgmt_xmit(skb, ieee); softmac_mgmt_xmit(skb, ieee);
} }
inline struct sk_buff *ieee80211_probe_req(struct ieee80211_device *ieee) inline struct sk_buff *ieee80211_probe_req(struct ieee80211_device *ieee)
...@@ -425,10 +425,10 @@ static void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee) ...@@ -425,10 +425,10 @@ static void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee)
void ieee80211_softmac_ips_scan_syncro(struct ieee80211_device *ieee) void ieee80211_softmac_ips_scan_syncro(struct ieee80211_device *ieee)
{ {
int ch; int ch;
unsigned int watch_dog = 0; unsigned int watch_dog = 0;
u8 channel_map[MAX_CHANNEL_NUMBER+1]; u8 channel_map[MAX_CHANNEL_NUMBER+1];
memcpy(channel_map, GET_DOT11D_INFO(ieee)->channel_map, MAX_CHANNEL_NUMBER+1); memcpy(channel_map, GET_DOT11D_INFO(ieee)->channel_map, MAX_CHANNEL_NUMBER+1);
down(&ieee->scan_sem); down(&ieee->scan_sem);
ch = ieee->current_network.channel; ch = ieee->current_network.channel;
while (1) { while (1) {
...@@ -467,7 +467,7 @@ void ieee80211_softmac_ips_scan_syncro(struct ieee80211_device *ieee) ...@@ -467,7 +467,7 @@ void ieee80211_softmac_ips_scan_syncro(struct ieee80211_device *ieee)
ieee->current_network.channel = (ieee->current_network.channel + 1)%MAX_CHANNEL_NUMBER; ieee->current_network.channel = (ieee->current_network.channel + 1)%MAX_CHANNEL_NUMBER;
} while (!channel_map[ieee->current_network.channel]); } while (!channel_map[ieee->current_network.channel]);
} }
out: out:
ieee->actscanning = false; ieee->actscanning = false;
up(&ieee->scan_sem); up(&ieee->scan_sem);
...@@ -532,7 +532,7 @@ static void ieee80211_beacons_stop(struct ieee80211_device *ieee) ...@@ -532,7 +532,7 @@ static void ieee80211_beacons_stop(struct ieee80211_device *ieee)
spin_lock_irqsave(&ieee->beacon_lock, flags); spin_lock_irqsave(&ieee->beacon_lock, flags);
ieee->beacon_txing = 0; ieee->beacon_txing = 0;
del_timer_sync(&ieee->beacon_timer); del_timer_sync(&ieee->beacon_timer);
spin_unlock_irqrestore(&ieee->beacon_lock, flags); spin_unlock_irqrestore(&ieee->beacon_lock, flags);
} }
...@@ -982,8 +982,8 @@ ieee80211_association_req(struct ieee80211_network *beacon, ...@@ -982,8 +982,8 @@ ieee80211_association_req(struct ieee80211_network *beacon,
ieee80211_WMM_Info(ieee, &tag); ieee80211_WMM_Info(ieee, &tag);
tag = skb_put(skb, turbo_info_len); tag = skb_put(skb, turbo_info_len);
if (turbo_info_len) if (turbo_info_len)
ieee80211_TURBO_Info(ieee, &tag); ieee80211_TURBO_Info(ieee, &tag);
return skb; return skb;
} }
...@@ -1416,15 +1416,15 @@ void ieee80211_sta_ps_send_null_frame(struct ieee80211_device *ieee, short pwr) ...@@ -1416,15 +1416,15 @@ void ieee80211_sta_ps_send_null_frame(struct ieee80211_device *ieee, short pwr)
static short ieee80211_sta_ps_sleep(struct ieee80211_device *ieee, u32 *time_h, static short ieee80211_sta_ps_sleep(struct ieee80211_device *ieee, u32 *time_h,
u32 *time_l) u32 *time_l)
{ {
int timeout = 0; int timeout = 0;
u8 dtim; u8 dtim;
dtim = ieee->current_network.dtim_data; dtim = ieee->current_network.dtim_data;
if (!(dtim & IEEE80211_DTIM_VALID)) if (!(dtim & IEEE80211_DTIM_VALID))
return 0; return 0;
else else
timeout = ieee->current_network.beacon_interval; timeout = ieee->current_network.beacon_interval;
ieee->current_network.dtim_data = IEEE80211_DTIM_INVALID; ieee->current_network.dtim_data = IEEE80211_DTIM_INVALID;
...@@ -1613,30 +1613,30 @@ inline int ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, ...@@ -1613,30 +1613,30 @@ inline int ieee80211_rx_frame_softmac(struct ieee80211_device *ieee,
} }
switch (info_element->id) { switch (info_element->id) {
case MFIE_TYPE_GENERIC: case MFIE_TYPE_GENERIC:
IEEE80211_DEBUG_SCAN("MFIE_TYPE_GENERIC: %d bytes\n", info_element->len); IEEE80211_DEBUG_SCAN("MFIE_TYPE_GENERIC: %d bytes\n", info_element->len);
if (info_element->len >= 8 && if (info_element->len >= 8 &&
info_element->data[0] == 0x00 && info_element->data[0] == 0x00 &&
info_element->data[1] == 0x50 && info_element->data[1] == 0x50 &&
info_element->data[2] == 0xf2 && info_element->data[2] == 0xf2 &&
info_element->data[3] == 0x02 && info_element->data[3] == 0x02 &&
info_element->data[4] == 0x01) { info_element->data[4] == 0x01) {
/* Not care about version at present. /* Not care about version at present.
* WMM Parameter Element. * WMM Parameter Element.
*/
memcpy(ieee->current_network.wmm_param, (u8*)(info_element->data\
+ 8), (info_element->len - 8));
if (((ieee->current_network.wmm_info^info_element->data[6])& \
0x0f)||(!ieee->init_wmmparam_flag)) {
/* refresh parameter element for current network
* update the register parameter for hardware.
*/ */
ieee->init_wmmparam_flag = 1; memcpy(ieee->current_network.wmm_param, (u8*)(info_element->data\
queue_work(ieee->wq, &ieee->wmm_param_update_wq); + 8), (info_element->len - 8));
} if (((ieee->current_network.wmm_info^info_element->data[6])& \
/* update info_element for current network */ 0x0f)||(!ieee->init_wmmparam_flag)) {
ieee->current_network.wmm_info = info_element->data[6]; /* refresh parameter element for current network
* update the register parameter for hardware.
*/
ieee->init_wmmparam_flag = 1;
queue_work(ieee->wq, &ieee->wmm_param_update_wq);
}
/* update info_element for current network */
ieee->current_network.wmm_info = info_element->data[6];
} }
break; break;
default: default:
...@@ -2185,7 +2185,7 @@ void ieee80211_softmac_start_protocol(struct ieee80211_device *ieee) ...@@ -2185,7 +2185,7 @@ void ieee80211_softmac_start_protocol(struct ieee80211_device *ieee)
void ieee80211_start_protocol(struct ieee80211_device *ieee) void ieee80211_start_protocol(struct ieee80211_device *ieee)
{ {
short ch = 0; short ch = 0;
int i = 0; int i = 0;
if (ieee->proto_started) if (ieee->proto_started)
return; return;
...@@ -2453,7 +2453,7 @@ static int ieee80211_wpa_set_param(struct ieee80211_device *ieee, u8 name, ...@@ -2453,7 +2453,7 @@ static int ieee80211_wpa_set_param(struct ieee80211_device *ieee, u8 name,
.flags = SEC_ENABLED, .flags = SEC_ENABLED,
.enabled = value, .enabled = value,
}; };
ieee->drop_unencrypted = value; ieee->drop_unencrypted = value;
/* We only change SEC_LEVEL for open mode. Others /* We only change SEC_LEVEL for open mode. Others
* are set by ipw_wpa_set_encryption. * are set by ipw_wpa_set_encryption.
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment