From: Colin Ian King <[email protected]>
There is a block of statements that are indented
too deeply, remove the extraneous tabs.
Signed-off-by: Colin Ian King <[email protected]>
---
drivers/staging/rtl8192u/r819xU_cmdpkt.c | 25 ++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8192u/r819xU_cmdpkt.c b/drivers/staging/rtl8192u/r819xU_cmdpkt.c
index e064f43fd8b6..bc98cdaf61ec 100644
--- a/drivers/staging/rtl8192u/r819xU_cmdpkt.c
+++ b/drivers/staging/rtl8192u/r819xU_cmdpkt.c
@@ -169,19 +169,20 @@ static void cmdpkt_beacontimerinterrupt_819xusb(struct net_device *dev)
{
struct r8192_priv *priv = ieee80211_priv(dev);
u16 tx_rate;
- /* 87B have to S/W beacon for DTM encryption_cmn. */
- if (priv->ieee80211->current_network.mode == IEEE_A ||
- priv->ieee80211->current_network.mode == IEEE_N_5G ||
- (priv->ieee80211->current_network.mode == IEEE_N_24G &&
- (!priv->ieee80211->pHTInfo->bCurSuppCCK))) {
- tx_rate = 60;
- DMESG("send beacon frame tx rate is 6Mbpm\n");
- } else {
- tx_rate = 10;
- DMESG("send beacon frame tx rate is 1Mbpm\n");
- }
- rtl819xusb_beacon_tx(dev, tx_rate); /* HW Beacon */
+ /* 87B have to S/W beacon for DTM encryption_cmn. */
+ if (priv->ieee80211->current_network.mode == IEEE_A ||
+ priv->ieee80211->current_network.mode == IEEE_N_5G ||
+ (priv->ieee80211->current_network.mode == IEEE_N_24G &&
+ (!priv->ieee80211->pHTInfo->bCurSuppCCK))) {
+ tx_rate = 60;
+ DMESG("send beacon frame tx rate is 6Mbpm\n");
+ } else {
+ tx_rate = 10;
+ DMESG("send beacon frame tx rate is 1Mbpm\n");
+ }
+
+ rtl819xusb_beacon_tx(dev, tx_rate); /* HW Beacon */
}
/*-----------------------------------------------------------------------------
--
2.20.1
Am 14.11.2019 10:54, schrieb Colin King:
> From: Colin Ian King <[email protected]>
>
> There is a block of statements that are indented
> too deeply, remove the extraneous tabs.
>
> Signed-off-by: Colin Ian King <[email protected]>
> ---
> drivers/staging/rtl8192u/r819xU_cmdpkt.c | 25 ++++++++++++------------
> 1 file changed, 13 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/staging/rtl8192u/r819xU_cmdpkt.c b/drivers/staging/rtl8192u/r819xU_cmdpkt.c
> index e064f43fd8b6..bc98cdaf61ec 100644
> --- a/drivers/staging/rtl8192u/r819xU_cmdpkt.c
> +++ b/drivers/staging/rtl8192u/r819xU_cmdpkt.c
> @@ -169,19 +169,20 @@ static void cmdpkt_beacontimerinterrupt_819xusb(struct net_device *dev)
> {
> struct r8192_priv *priv = ieee80211_priv(dev);
> u16 tx_rate;
> - /* 87B have to S/W beacon for DTM encryption_cmn. */
> - if (priv->ieee80211->current_network.mode == IEEE_A ||
> - priv->ieee80211->current_network.mode == IEEE_N_5G ||
> - (priv->ieee80211->current_network.mode == IEEE_N_24G &&
> - (!priv->ieee80211->pHTInfo->bCurSuppCCK))) {
> - tx_rate = 60;
> - DMESG("send beacon frame tx rate is 6Mbpm\n");
> - } else {
> - tx_rate = 10;
> - DMESG("send beacon frame tx rate is 1Mbpm\n");
> - }
>
> - rtl819xusb_beacon_tx(dev, tx_rate); /* HW Beacon */
> + /* 87B have to S/W beacon for DTM encryption_cmn. */
> + if (priv->ieee80211->current_network.mode == IEEE_A ||
> + priv->ieee80211->current_network.mode == IEEE_N_5G ||
> + (priv->ieee80211->current_network.mode == IEEE_N_24G &&
> + (!priv->ieee80211->pHTInfo->bCurSuppCCK))) {
> + tx_rate = 60;
> + DMESG("send beacon frame tx rate is 6Mbpm\n");
> + } else {
> + tx_rate = 10;
> + DMESG("send beacon frame tx rate is 1Mbpm\n");
> + }
> +
> + rtl819xusb_beacon_tx(dev, tx_rate); /* HW Beacon */
> }
>
> /*-----------------------------------------------------------------------------
this is hard to read in the first place.
Maybe using switch() here is better to read (untested example below).
switch(priv->ieee80211->current_network.mode) {
case IEEE_A:
case IEEE_N_5G:
tx_rate = 60;
break;
IEEE_N_24G:
if ( !priv->ieee80211->pHTInfo->bCurSuppCCK )
tx_rate = 60;
// fall truh
default:
tx_rate = 10;
}
if (txrate == 60 )
DMESG("send beacon frame tx rate is 6Mbpm\n");
else if (txrate == 10 )
DMESG("send beacon frame tx rate is 1Mbpm\n");
JM2C
re,
wh
On Thu, 2019-11-14 at 09:54 +0000, Colin King wrote:
> From: Colin Ian King <[email protected]>
>
> There is a block of statements that are indented
> too deeply, remove the extraneous tabs.
[]
> diff --git a/drivers/staging/rtl8192u/r819xU_cmdpkt.c b/drivers/staging/rtl8192u/r819xU_cmdpkt.c
[]
> @@ -169,19 +169,20 @@ static void cmdpkt_beacontimerinterrupt_819xusb(struct net_device *dev)
> {
> struct r8192_priv *priv = ieee80211_priv(dev);
> u16 tx_rate;
> - /* 87B have to S/W beacon for DTM encryption_cmn. */
> - if (priv->ieee80211->current_network.mode == IEEE_A ||
> - priv->ieee80211->current_network.mode == IEEE_N_5G ||
> - (priv->ieee80211->current_network.mode == IEEE_N_24G &&
> - (!priv->ieee80211->pHTInfo->bCurSuppCCK))) {
> - tx_rate = 60;
> - DMESG("send beacon frame tx rate is 6Mbpm\n");
> - } else {
> - tx_rate = 10;
> - DMESG("send beacon frame tx rate is 1Mbpm\n");
> - }
>
> - rtl819xusb_beacon_tx(dev, tx_rate); /* HW Beacon */
> + /* 87B have to S/W beacon for DTM encryption_cmn. */
> + if (priv->ieee80211->current_network.mode == IEEE_A ||
> + priv->ieee80211->current_network.mode == IEEE_N_5G ||
> + (priv->ieee80211->current_network.mode == IEEE_N_24G &&
> + (!priv->ieee80211->pHTInfo->bCurSuppCCK))) {
> + tx_rate = 60;
> + DMESG("send beacon frame tx rate is 6Mbpm\n");
> + } else {
> + tx_rate = 10;
> + DMESG("send beacon frame tx rate is 1Mbpm\n");
> + }
> +
> + rtl819xusb_beacon_tx(dev, tx_rate); /* HW Beacon */
This function might as well be deleted instead as
rtl819xusb_beacon_tx is a noop function in
drivers/staging/rtl8192u/r8192U_core.c
void rtl819xusb_beacon_tx(struct net_device *dev, u16 tx_rate)
{
}
On Fri, 2019-11-15 at 22:45 -0800, Joe Perches wrote:
> This function might as well be deleted instead as
> rtl819xusb_beacon_tx is a noop function in
> drivers/staging/rtl8192u/r8192U_core.c
Perhaps:
---
drivers/staging/rtl8192u/r8192U.h | 1 -
drivers/staging/rtl8192u/r8192U_core.c | 7 -------
drivers/staging/rtl8192u/r819xU_cmdpkt.c | 22 ----------------------
3 files changed, 30 deletions(-)
diff --git a/drivers/staging/rtl8192u/r8192U.h b/drivers/staging/rtl8192u/r8192U.h
index ec33fb9..0891db 100644
--- a/drivers/staging/rtl8192u/r8192U.h
+++ b/drivers/staging/rtl8192u/r8192U.h
@@ -1111,7 +1111,6 @@ int rtl8192_up(struct net_device *dev);
void rtl8192_commit(struct net_device *dev);
void rtl8192_set_chan(struct net_device *dev, short ch);
void rtl8192_set_rxconf(struct net_device *dev);
-void rtl819xusb_beacon_tx(struct net_device *dev, u16 tx_rate);
void EnableHWSecurityConfig8192(struct net_device *dev);
void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType, u8 *MacAddr, u8 DefaultKey, u32 *KeyContent);
diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
index 48f1591e..98705e 100644
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -1163,13 +1163,6 @@ static void rtl8192_net_update(struct net_device *dev)
}
}
-/* temporary hw beacon is not used any more.
- * open it when necessary
- */
-void rtl819xusb_beacon_tx(struct net_device *dev, u16 tx_rate)
-{
-}
-
short rtl819xU_tx_cmd(struct net_device *dev, struct sk_buff *skb)
{
struct r8192_priv *priv = ieee80211_priv(dev);
diff --git a/drivers/staging/rtl8192u/r819xU_cmdpkt.c b/drivers/staging/rtl8192u/r819xU_cmdpkt.c
index e064f4..83d1fc7 100644
--- a/drivers/staging/rtl8192u/r819xU_cmdpkt.c
+++ b/drivers/staging/rtl8192u/r819xU_cmdpkt.c
@@ -165,25 +165,6 @@ static void cmpk_handle_tx_feedback(struct net_device *dev, u8 *pmsg)
*/
}
-static void cmdpkt_beacontimerinterrupt_819xusb(struct net_device *dev)
-{
- struct r8192_priv *priv = ieee80211_priv(dev);
- u16 tx_rate;
- /* 87B have to S/W beacon for DTM encryption_cmn. */
- if (priv->ieee80211->current_network.mode == IEEE_A ||
- priv->ieee80211->current_network.mode == IEEE_N_5G ||
- (priv->ieee80211->current_network.mode == IEEE_N_24G &&
- (!priv->ieee80211->pHTInfo->bCurSuppCCK))) {
- tx_rate = 60;
- DMESG("send beacon frame tx rate is 6Mbpm\n");
- } else {
- tx_rate = 10;
- DMESG("send beacon frame tx rate is 1Mbpm\n");
- }
-
- rtl819xusb_beacon_tx(dev, tx_rate); /* HW Beacon */
-}
-
/*-----------------------------------------------------------------------------
* Function: cmpk_handle_interrupt_status()
*
@@ -238,9 +219,6 @@ static void cmpk_handle_interrupt_status(struct net_device *dev, u8 *pmsg)
priv->ieee80211->bibsscoordinator = false;
priv->stats.txbeaconerr++;
}
-
- if (rx_intr_status.interrupt_status & ISR_BCN_TIMER_INTR)
- cmdpkt_beacontimerinterrupt_819xusb(dev);
}
/* Other information in interrupt status we need? */