Fixed multiple blank lines issues reported by checkpatch.pl Signed-off-by: Tapan Prakash T <tapanprakasht@xxxxxxxxx> --- drivers/staging/rtl8192e/rtllib_softmac.c | 62 ------------------------------- 1 file changed, 62 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index 25b5b5e..cf2258e 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -142,7 +142,6 @@ static void enqueue_mgmt(struct rtllib_device *ieee, struct sk_buff *skb) */ ieee->mgmt_queue_head = nh; ieee->mgmt_queue_ring[nh] = skb; - } static void init_mgmt_queue(struct rtllib_device *ieee) @@ -150,7 +149,6 @@ static void init_mgmt_queue(struct rtllib_device *ieee) ieee->mgmt_queue_tail = ieee->mgmt_queue_head = 0; } - u8 MgntQuery_TxRateExcludeCCKRates(struct rtllib_device *ieee) { @@ -158,7 +156,6 @@ MgntQuery_TxRateExcludeCCKRates(struct rtllib_device *ieee) u8 QueryRate = 0; u8 BasicRate; - for (i = 0; i < ieee->current_network.rates_len; i++) { BasicRate = ieee->current_network.rates[i]&0x7F; if (!rtllib_is_cck_rate(BasicRate)) { @@ -289,7 +286,6 @@ inline void softmac_ps_mgmt_xmit(struct sk_buff *skb, type = WLAN_FC_GET_TYPE(fc); stype = WLAN_FC_GET_STYPE(fc); - if (stype != RTLLIB_STYPE_PSPOLL) tcb_desc->queue_index = MGNT_QUEUE; else @@ -298,7 +294,6 @@ inline void softmac_ps_mgmt_xmit(struct sk_buff *skb, if (ieee->disable_mgnt_queue) tcb_desc->queue_index = HIGH_QUEUE; - tcb_desc->data_rate = MgntQuery_MgntFrameTxRate(ieee); tcb_desc->RATRIndex = 7; tcb_desc->bTxDisableRateFallBack = 1; @@ -311,7 +306,6 @@ inline void softmac_ps_mgmt_xmit(struct sk_buff *skb, ieee->seq_ctrl[0] = 0; else ieee->seq_ctrl[0]++; - } /* avoid watchdog triggers */ ieee->softmac_data_hard_start_xmit(skb, ieee->dev, @@ -327,7 +321,6 @@ inline void softmac_ps_mgmt_xmit(struct sk_buff *skb, ieee->seq_ctrl[0]++; } ieee->softmac_hard_start_xmit(skb, ieee->dev); - } } @@ -392,7 +385,6 @@ static void rtllib_send_beacon(struct rtllib_device *ieee) (msecs_to_jiffies(ieee->current_network.beacon_interval - 5))); } - static void rtllib_send_beacon_cb(unsigned long _ieee) { struct rtllib_device *ieee = @@ -415,7 +407,6 @@ void rtllib_EnableNetMonitorMode(struct net_device *dev, ieee->AllowAllDestAddrHandler(dev, true, !bInitState); } - /* Disables network monitor mode. Only packets destinated to * us will be received. */ @@ -429,7 +420,6 @@ void rtllib_DisableNetMonitorMode(struct net_device *dev, ieee->AllowAllDestAddrHandler(dev, false, !bInitState); } - /* Enables the specialized promiscuous mode required by Intel. * In this mode, Intel intends to hear traffics from/to other STAs in the * same BSS. Therefore we don't have to disable checking BSSID and we only need @@ -453,7 +443,6 @@ void rtllib_EnableIntelPromiscuousMode(struct net_device *dev, } EXPORT_SYMBOL(rtllib_EnableIntelPromiscuousMode); - /* Disables the specialized promiscuous mode required by Intel. * See MgntEnableIntelPromiscuousMode for detail. */ @@ -485,7 +474,6 @@ static void rtllib_send_probe(struct rtllib_device *ieee, u8 is_mesh) } } - static void rtllib_send_probe_requests(struct rtllib_device *ieee, u8 is_mesh) { if (ieee->active_scan && (ieee->softmac_features & @@ -633,8 +621,6 @@ out1: up(&ieee->scan_sem); } - - static void rtllib_beacons_start(struct rtllib_device *ieee) { unsigned long flags; @@ -657,10 +643,8 @@ static void rtllib_beacons_stop(struct rtllib_device *ieee) del_timer_sync(&ieee->beacon_timer); spin_unlock_irqrestore(&ieee->beacon_lock, flags); - } - void rtllib_stop_send_beacons(struct rtllib_device *ieee) { if (ieee->stop_send_beacons) @@ -670,7 +654,6 @@ void rtllib_stop_send_beacons(struct rtllib_device *ieee) } EXPORT_SYMBOL(rtllib_stop_send_beacons); - void rtllib_start_send_beacons(struct rtllib_device *ieee) { if (ieee->start_send_beacons) @@ -680,7 +663,6 @@ void rtllib_start_send_beacons(struct rtllib_device *ieee) } EXPORT_SYMBOL(rtllib_start_send_beacons); - static void rtllib_softmac_stop_scan(struct rtllib_device *ieee) { down(&ieee->scan_sem); @@ -912,7 +894,6 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_device *ieee, if (encrypt) beacon_buf->capability |= cpu_to_le16(WLAN_CAPABILITY_PRIVACY); - beacon_buf->header.frame_ctl = cpu_to_le16(RTLLIB_STYPE_PROBE_RESP); beacon_buf->info_element[0].id = MFIE_TYPE_SSID; beacon_buf->info_element[0].len = ssid_len; @@ -992,7 +973,6 @@ static struct sk_buff *rtllib_assoc_resp(struct rtllib_device *ieee, u8 *dest) assoc->capability = cpu_to_le16(ieee->iw_mode == IW_MODE_MASTER ? WLAN_CAPABILITY_ESS : WLAN_CAPABILITY_IBSS); - if (ieee->short_slot) assoc->capability |= cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT_TIME); @@ -1048,8 +1028,6 @@ static struct sk_buff *rtllib_auth_resp(struct rtllib_device *ieee, int status, ether_addr_copy(auth->header.addr1, dest); auth->header.frame_ctl = cpu_to_le16(RTLLIB_STYPE_AUTH); return skb; - - } static struct sk_buff *rtllib_null_func(struct rtllib_device *ieee, short pwr) @@ -1075,8 +1053,6 @@ static struct sk_buff *rtllib_null_func(struct rtllib_device *ieee, short pwr) (pwr ? RTLLIB_FCTL_PM : 0)); return skb; - - } static struct sk_buff *rtllib_pspoll_func(struct rtllib_device *ieee) @@ -1101,7 +1077,6 @@ static struct sk_buff *rtllib_pspoll_func(struct rtllib_device *ieee) RTLLIB_FCTL_PM); return skb; - } static void rtllib_resp_to_assoc_rq(struct rtllib_device *ieee, u8 *dest) @@ -1112,7 +1087,6 @@ static void rtllib_resp_to_assoc_rq(struct rtllib_device *ieee, u8 *dest) softmac_mgmt_xmit(buf, ieee); } - static void rtllib_resp_to_auth(struct rtllib_device *ieee, int s, u8 *dest) { struct sk_buff *buf = rtllib_auth_resp(ieee, s, dest); @@ -1121,7 +1095,6 @@ static void rtllib_resp_to_auth(struct rtllib_device *ieee, int s, u8 *dest) softmac_mgmt_xmit(buf, ieee); } - static void rtllib_resp_to_probe(struct rtllib_device *ieee, u8 *dest) { struct sk_buff *buf = rtllib_probe_resp(ieee, dest); @@ -1130,7 +1103,6 @@ static void rtllib_resp_to_probe(struct rtllib_device *ieee, u8 *dest) softmac_mgmt_xmit(buf, ieee); } - inline int SecIsInPMKIDList(struct rtllib_device *ieee, u8 *bssid) { int i = 0; @@ -1243,7 +1215,6 @@ inline struct sk_buff *rtllib_association_req(struct rtllib_network *beacon, hdr = (struct rtllib_assoc_request_frame *) skb_put(skb, sizeof(struct rtllib_assoc_request_frame) + 2); - hdr->header.frame_ctl = cpu_to_le16(RTLLIB_STYPE_ASSOC_REQ); hdr->header.duration_id = cpu_to_le16(37); ether_addr_copy(hdr->header.addr1, beacon->bssid); @@ -1263,7 +1234,6 @@ inline struct sk_buff *rtllib_association_req(struct rtllib_network *beacon, (beacon->capability&WLAN_CAPABILITY_SHORT_SLOT_TIME)) hdr->capability |= cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT_TIME); - hdr->listen_interval = cpu_to_le16(beacon->listen_interval); hdr->info_element[0].id = MFIE_TYPE_SSID; @@ -1566,7 +1536,6 @@ static void rtllib_associate_complete_wq(void *data) if (ieee->data_hard_resume) ieee->data_hard_resume(ieee->dev); - } static void rtllib_sta_send_associnfo(struct rtllib_device *ieee) @@ -1762,7 +1731,6 @@ static void rtllib_softmac_check_all_nets(struct rtllib_device *ieee) spin_lock_irqsave(&ieee->lock, flags); list_for_each_entry(target, &ieee->network_list, list) { - /* if the state become different that NOLINK means * we had found what we are searching for */ @@ -1943,7 +1911,6 @@ static inline void rtllib_rx_assoc_rq(struct rtllib_device *ieee, { u8 dest[ETH_ALEN]; - ieee->softmac_stats.rx_ass_rq++; if (assoc_rq_parse(ieee->dev, skb, dest) != -1) rtllib_resp_to_assoc_rq(ieee, dest); @@ -1953,7 +1920,6 @@ static inline void rtllib_rx_assoc_rq(struct rtllib_device *ieee, void rtllib_sta_ps_send_null_frame(struct rtllib_device *ieee, short pwr) { - struct sk_buff *buf = rtllib_null_func(ieee, pwr); if (buf) @@ -2051,8 +2017,6 @@ static short rtllib_sta_ps_sleep(struct rtllib_device *ieee, u64 *time) } return 1; - - } static inline void rtllib_sta_ps(struct rtllib_device *ieee) @@ -2091,7 +2055,6 @@ static inline void rtllib_sta_ps(struct rtllib_device *ieee) ieee->ps_time = time; } spin_unlock_irqrestore(&ieee->mgmt_tx_lock, flags2); - } ieee->bAwakePktSent = false; @@ -2106,7 +2069,6 @@ static inline void rtllib_sta_ps(struct rtllib_device *ieee) out: spin_unlock_irqrestore(&ieee->lock, flags); - } static void rtllib_sta_wakeup(struct rtllib_device *ieee, short nl) @@ -2123,7 +2085,6 @@ static void rtllib_sta_wakeup(struct rtllib_device *ieee, short nl) } } return; - } if (ieee->sta_sleep == LPS_IS_SLEEP) @@ -2348,7 +2309,6 @@ static void rtllib_rx_auth_resp(struct rtllib_device *ieee, struct sk_buff *skb) inline int rtllib_rx_auth(struct rtllib_device *ieee, struct sk_buff *skb, struct rtllib_rx_stats *rx_stats) { - if (ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) { if (ieee->state == RTLLIB_ASSOCIATING_AUTHENTICATING && (ieee->iw_mode == IW_MODE_INFRA)) { @@ -2459,7 +2419,6 @@ inline int rtllib_rx_frame_softmac(struct rtllib_device *ieee, */ void rtllib_softmac_xmit(struct rtllib_txb *txb, struct rtllib_device *ieee) { - unsigned int queue_index = txb->queue_index; unsigned long flags; int i; @@ -2504,7 +2463,6 @@ void rtllib_softmac_xmit(struct rtllib_txb *txb, struct rtllib_device *ieee) rtllib_txb_free(txb); spin_unlock_irqrestore(&ieee->lock, flags); - } void rtllib_reset_queue(struct rtllib_device *ieee) @@ -2519,7 +2477,6 @@ void rtllib_reset_queue(struct rtllib_device *ieee) } ieee->queue_stop = 0; spin_unlock_irqrestore(&ieee->lock, flags); - } EXPORT_SYMBOL(rtllib_reset_queue); @@ -2540,7 +2497,6 @@ void rtllib_wake_all_queues(struct rtllib_device *ieee) inline void rtllib_randomize_cell(struct rtllib_device *ieee) { - random_ether_addr(ieee->current_network.bssid); } @@ -2611,7 +2567,6 @@ static void rtllib_start_ibss_wq(void *data) /* check if we have this cell in our network list */ rtllib_softmac_check_all_nets(ieee); - /* if not then the state is not linked. Maybe the user switched to * ad-hoc mode just after being in monitor mode, or just after * being very few time in managed mode (so the card have had no @@ -2637,7 +2592,6 @@ static void rtllib_start_ibss_wq(void *data) rtllib_randomize_cell(ieee); if (ieee->modulation & RTLLIB_CCK_MODULATION) { - ieee->current_network.rates_len = 4; ieee->current_network.rates[0] = @@ -2833,7 +2787,6 @@ static struct sk_buff *rtllib_get_beacon_(struct rtllib_device *ieee) b->header.frame_ctl = cpu_to_le16(RTLLIB_STYPE_BEACON); return skb; - } struct sk_buff *rtllib_get_beacon(struct rtllib_device *ieee) @@ -2867,7 +2820,6 @@ void rtllib_softmac_stop_protocol(struct rtllib_device *ieee, u8 mesh_flag, } EXPORT_SYMBOL(rtllib_softmac_stop_protocol); - void rtllib_stop_protocol(struct rtllib_device *ieee, u8 shutdown) { if (!ieee->proto_started) @@ -3027,7 +2979,6 @@ void rtllib_softmac_init(struct rtllib_device *ieee) rtllib_send_beacon_cb, (unsigned long) ieee); - ieee->wq = create_workqueue(DRV_NAME); INIT_DELAYED_WORK_RSL(&ieee->link_change_wq, @@ -3055,7 +3006,6 @@ void rtllib_softmac_init(struct rtllib_device *ieee) tasklet_init(&ieee->ps_task, (void(*)(unsigned long)) rtllib_sta_ps, (unsigned long)ieee); - } void rtllib_softmac_free(struct rtllib_device *ieee) @@ -3076,7 +3026,6 @@ void rtllib_softmac_free(struct rtllib_device *ieee) * this is stolen from the ipw2200 driver * ********************************************************/ - static int rtllib_wpa_enable(struct rtllib_device *ieee, int value) { /* This is called when wpa_supplicant loads and closes the driver @@ -3088,7 +3037,6 @@ static int rtllib_wpa_enable(struct rtllib_device *ieee, int value) return 0; } - static void rtllib_wpa_assoc_frame(struct rtllib_device *ieee, char *wpa_ie, int wpa_ie_len) { @@ -3098,10 +3046,8 @@ static void rtllib_wpa_assoc_frame(struct rtllib_device *ieee, char *wpa_ie, rtllib_disassociate(ieee); } - static int rtllib_wpa_mlme(struct rtllib_device *ieee, int command, int reason) { - int ret = 0; switch (command) { @@ -3120,7 +3066,6 @@ static int rtllib_wpa_mlme(struct rtllib_device *ieee, int command, int reason) return ret; } - static int rtllib_wpa_set_wpa_ie(struct rtllib_device *ieee, struct ieee_param *param, int plen) { @@ -3154,7 +3099,6 @@ static int rtllib_wpa_set_wpa_ie(struct rtllib_device *ieee, #define AUTH_ALG_LEAP 0x4 static int rtllib_wpa_set_auth_algs(struct rtllib_device *ieee, int value) { - struct rtllib_security sec = { .flags = SEC_AUTH_MODE, }; @@ -3173,7 +3117,6 @@ static int rtllib_wpa_set_auth_algs(struct rtllib_device *ieee, int value) ieee->auth_mode = 2; } - if (ieee->set_security) ieee->set_security(ieee->dev, &sec); @@ -3574,7 +3517,6 @@ static void rtllib_MgntDisconnectIBSS(struct rtllib_device *rtllib) rtllib->SetHwRegHandler(rtllib->dev, HW_VAR_CECHK_BSSID, (u8 *)(&bFilterOutNonAssociatedBSSID)); notify_wx_assoc_event(rtllib); - } static void rtllib_MlmeDisassociateRequest(struct rtllib_device *rtllib, @@ -3598,9 +3540,7 @@ static void rtllib_MlmeDisassociateRequest(struct rtllib_device *rtllib, rtllib->SetHwRegHandler(rtllib->dev, HW_VAR_BSSID, rtllib->current_network.bssid); - } - } static void @@ -3630,7 +3570,6 @@ bool rtllib_MgntDisconnect(struct rtllib_device *rtllib, u8 asRsn) rtllib_MgntDisconnectIBSS(rtllib); if (rtllib->iw_mode == IW_MODE_INFRA) rtllib_MgntDisconnectAP(rtllib, asRsn); - } return true; @@ -3649,7 +3588,6 @@ void notify_wx_assoc_event(struct rtllib_device *ieee) memcpy(wrqu.ap_addr.sa_data, ieee->current_network.bssid, ETH_ALEN); else { - netdev_info(ieee->dev, "%s(): Tell user space disconnected\n", __func__); eth_zero_addr(wrqu.ap_addr.sa_data); -- 1.9.1 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel