From: Derek Robson <robsonde@gmail.com>
To: gregkh@linuxfoundation.org, robsonde@gmail.com
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 14/25] Staging: rtl8192u: ieee80211: ieee80211_softmac.c - style fix
Date: Mon, 13 Feb 2017 18:42:47 +1300 [thread overview]
Message-ID: <5bb1caade3f020580e11ef90af41b790062b8f8b.1486963767.git.robsonde@gmail.com> (raw)
In-Reply-To: <cover.1486963767.git.robsonde@gmail.com>
Fixed style of block comments
Found using checkpatch
Signed-off-by: Derek Robson <robsonde@gmail.com>
---
.../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 844e257ece7a..ab1018c0bb0b 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
@@ -203,14 +203,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;
}
@@ -270,10 +270,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 {
@@ -1455,8 +1455,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;
@@ -1726,11 +1726,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;
@@ -2092,8 +2091,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){
@@ -2168,7 +2167,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
@@ -2517,18 +2516,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);
@@ -2765,7 +2764,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;
@@ -3082,7 +3082,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
next prev parent reply other threads:[~2017-02-13 5:42 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-13 5:38 [PATCH v2 00/25] Staging: rtl8192u - fixed block comments Derek Robson
2017-02-13 5:39 ` [PATCH v2 01/25] Staging: rtl8192u: r819xU_phy.c - style fix Derek Robson
2017-02-14 17:23 ` Greg KH
2017-02-13 5:39 ` [PATCH v2 02/25] Staging: rtl8192u: r819xU_firmware.c " Derek Robson
2017-02-13 5:39 ` [PATCH v2 03/25] Staging: rtl8192u: r819xU_cmdpkt.h " Derek Robson
2017-02-13 5:40 ` [PATCH v2 04/25] Staging: rtl8192u: r819xU_cmdpkt.c " Derek Robson
2017-02-13 5:40 ` [PATCH v2 05/25] Staging: rtl8192u: r8192U_hw.h " Derek Robson
2017-02-13 5:40 ` [PATCH v2 06/25] Staging: rtl8192u: r8192U_dm.c " Derek Robson
2017-02-13 5:40 ` [PATCH v2 07/25] Staging: rtl8192u: r8192U_core.c " Derek Robson
2017-02-13 5:41 ` [PATCH v2 08/25] Staging: rtl8192u: r8192U.h " Derek Robson
2017-02-13 5:41 ` [PATCH v2 09/25] Staging: rtl8192u: r8190_rtl8256.h " Derek Robson
2017-02-13 5:41 ` [PATCH v2 10/25] Staging: rtl8192u: r8190_rtl8256.c " Derek Robson
2017-02-13 5:41 ` [PATCH v2 11/25] Staging: rtl8192u: r8180_93cx6.c " Derek Robson
2017-02-13 5:42 ` [PATCH v2 12/25] Staging: rtl8192u: ieee80211: ieee80211_crypt_wep.c " Derek Robson
2017-02-13 5:42 ` [PATCH v2 13/25] Staging: rtl8192u: ieee80211: rtl819x_TSProc.c " Derek Robson
2017-02-13 5:42 ` Derek Robson [this message]
2017-02-13 5:43 ` [PATCH v2 15/25] Staging: rtl8192u: ieee80211: ieee80211_module.c " Derek Robson
2017-02-13 5:43 ` [PATCH v2 16/25] Staging: rtl8192u: ieee80211: rtl819x_HTProc.c " Derek Robson
2017-02-13 5:43 ` [PATCH v2 17/25] Staging: rtl8192u: ieee80211: rtl819x_BAProc.c " Derek Robson
2017-02-13 5:44 ` [PATCH v2 18/25] Staging: rtl8192u: ieee80211: rtl819x_HT.h " Derek Robson
2017-02-13 5:44 ` [PATCH v2 19/25] Staging: rtl8192u: ieee80211: rtl819x_BA.h " Derek Robson
2017-02-13 5:44 ` [PATCH v2 20/25] Staging: rtl8192u: ieee80211: ieee80211_wx.c " Derek Robson
2017-02-13 5:45 ` [PATCH v2 21/25] Staging: rtl8192u: ieee80211: ieee80211_tx.c " Derek Robson
2017-02-13 5:45 ` [PATCH v2 22/25] Staging: rtl8192u: ieee80211: ieee80211_rx.c " Derek Robson
2017-02-13 5:45 ` [PATCH v2 23/25] Staging: rtl8192u: ieee80211: ieee80211_crypt.h " Derek Robson
2017-02-13 5:46 ` [PATCH v2 24/25] Staging: rtl8192u: ieee80211: ieee80211_crypt.c " Derek Robson
2017-02-13 5:46 ` [PATCH v2 25/25] Staging: rtl8192u: ieee80211: ieee80211.h " Derek Robson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5bb1caade3f020580e11ef90af41b790062b8f8b.1486963767.git.robsonde@gmail.com \
--to=robsonde@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®