From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753877AbdBPFco (ORCPT ); Thu, 16 Feb 2017 00:32:44 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:35622 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751819AbdBPFcm (ORCPT ); Thu, 16 Feb 2017 00:32:42 -0500 From: Derek Robson To: gregkh@linuxfoundation.org, binoy.jayan@linaro.org, robsonde@gmail.com Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 07/15] Staging: rtl8192u: ieee80211: ieee80211_softmac.c - style fix Date: Thu, 16 Feb 2017 18:32:29 +1300 Message-Id: <6dbdfea766c86936503af2f49d53b4c83d4b476e.1487222627.git.robsonde@gmail.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fixed style of block comments Found using checkpatch Signed-off-by: Derek Robson --- .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 71 +++++++++++----------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c index 1bff0e91cc0c..58df6910584c 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c @@ -204,14 +204,14 @@ static u8 MgntQuery_MgntFrameTxRate(struct ieee80211_device *ieee) } /* - // Data rate of ProbeReq is already decided. Annie, 2005-03-31 - if( pMgntInfo->bScanInProgress || (pMgntInfo->bDualModeScanStep!=0) ) - { - if(pMgntInfo->dot11CurrentWirelessMode==WIRELESS_MODE_A) - rate = 0x0c; - else - rate = 0x02; - } + * //Data rate of ProbeReq is already decided. Annie, 2005-03-31 + * if( pMgntInfo->bScanInProgress || (pMgntInfo->bDualModeScanStep!=0) ) + * { + * if(pMgntInfo->dot11CurrentWirelessMode==WIRELESS_MODE_A) + * rate = 0x0c; + * else + * rate = 0x02; + * } */ return rate; } @@ -272,10 +272,10 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee if(!ieee->check_nic_enough_desc(ieee->dev,tcb_desc->queue_index)||\ (skb_queue_len(&ieee->skb_waitQ[tcb_desc->queue_index]) != 0)||\ (ieee->queue_stop) ) { - /* insert the skb packet to the management queue */ - /* as for the completion function, it does not need + /* insert the skb packet to the management queue + * as for the completion function, it does not need * to check it any more. - * */ + */ printk("%s():insert to waitqueue!\n",__func__); skb_queue_tail(&ieee->skb_waitQ[tcb_desc->queue_index], skb); } else { @@ -1460,8 +1460,8 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee (!apset && ssidset && ssidbroad && ssidmatch) ){ /* if the essid is hidden replace it with the - * essid provided by the user. - */ + * essid provided by the user. + */ if (!ssidbroad) { strncpy(tmp_ssid, ieee->current_network.ssid, IW_ESSID_MAX_SIZE); tmp_ssid_len = ieee->current_network.ssid_len; @@ -1731,11 +1731,10 @@ static short ieee80211_sta_ps_sleep(struct ieee80211_device *ieee, u32 *time_h, int timeout = ieee->ps_timeout; u8 dtim; /*if(ieee->ps == IEEE80211_PS_DISABLED || - ieee->iw_mode != IW_MODE_INFRA || - ieee->state != IEEE80211_LINKED) - - return 0; - */ + * ieee->iw_mode != IW_MODE_INFRA || + * ieee->state != IEEE80211_LINKED) + * return 0; + */ dtim = ieee->current_network.dtim_data; if(!(dtim & IEEE80211_DTIM_VALID)) return 0; @@ -2097,8 +2096,8 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb, case IEEE80211_STYPE_DISASSOC: case IEEE80211_STYPE_DEAUTH: /* FIXME for now repeat all the association procedure - * both for disassociation and deauthentication - */ + * both for disassociation and deauthentication + */ if ((ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) && ieee->state == IEEE80211_LINKED && ieee->iw_mode == IW_MODE_INFRA){ @@ -2173,7 +2172,7 @@ void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device * /* insert the skb packet to the wait queue */ /* as for the completion function, it does not need * to check it any more. - * */ + */ //printk("error:no descriptor left@queue_index %d\n", queue_index); //ieee80211_stop_queue(ieee); #ifdef USB_TX_DRIVER_AGGREGATION_ENABLE @@ -2522,18 +2521,18 @@ static void ieee80211_associate_retry_wq(struct work_struct *work) goto exit; /* until we do not set the state to IEEE80211_NOLINK - * there are no possibility to have someone else trying - * to start an association procedure (we get here with - * ieee->state = IEEE80211_ASSOCIATING). - * When we set the state to IEEE80211_NOLINK it is possible - * that the RX path run an attempt to associate, but - * both ieee80211_softmac_check_all_nets and the - * RX path works with ieee->lock held so there are no - * problems. If we are still disassociated then start a scan. - * the lock here is necessary to ensure no one try to start - * an association procedure when we have just checked the - * state and we are going to start the scan. - */ + * there are no possibility to have someone else trying + * to start an association procedure (we get here with + * ieee->state = IEEE80211_ASSOCIATING). + * When we set the state to IEEE80211_NOLINK it is possible + * that the RX path run an attempt to associate, but + * both ieee80211_softmac_check_all_nets and the + * RX path works with ieee->lock held so there are no + * problems. If we are still disassociated then start a scan. + * the lock here is necessary to ensure no one try to start + * an association procedure when we have just checked the + * state and we are going to start the scan. + */ ieee->state = IEEE80211_NOLINK; ieee80211_softmac_check_all_nets(ieee); @@ -2771,7 +2770,8 @@ void ieee80211_softmac_free(struct ieee80211_device *ieee) static int ieee80211_wpa_enable(struct ieee80211_device *ieee, int value) { /* This is called when wpa_supplicant loads and closes the driver - * interface. */ + * interface. + */ printk("%s WPA\n", value ? "enabling" : "disabling"); ieee->wpa_enabled = value; return 0; @@ -3086,7 +3086,8 @@ static int ieee80211_wpa_set_encryption(struct ieee80211_device *ieee, * generate new IEEE 802.11 authentication which may end up in looping * with IEEE 802.1X. If your hardware requires a reset after WEP * configuration (for example... Prism2), implement the reset_port in - * the callbacks structures used to initialize the 802.11 stack. */ + * the callbacks structures used to initialize the 802.11 stack. + */ if (ieee->reset_on_keychange && ieee->iw_mode != IW_MODE_INFRA && ieee->reset_port && -- 2.11.1