* [PATCH] staging: rtl8188eu: remove code that is valid only for 5 GHz
@ 2018-09-13 20:32 Robert Węcławski
2018-09-14 6:12 ` Dan Carpenter
0 siblings, 1 reply; 4+ messages in thread
From: Robert Węcławski @ 2018-09-13 20:32 UTC (permalink / raw)
To: gregkh
Cc: Robert Węcławski, Michael Straube, Hans de Goede,
Janani Sankara Babu, Kacper Kołodziej, Bhaskar Singh,
Santha Meena Ramamoorthy, Kees Cook, Valentine Sinitsyn,
Colin Ian King, Aishwarya Pant, Mihaela Muraru, devel,
linux-kernel
Remove code that is used only for 5 GHz.
This addresses the below TODO item:
- find and remove remaining code valid only for 5 GHz. Most of the obvious
ones have been removed, but things like channel > 14 still exist.
Signed-off-by: Robert Węcławski <r.weclawski@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_ap.c | 23 ++++++-----------
drivers/staging/rtl8188eu/core/rtw_debug.c | 25 +------------------
drivers/staging/rtl8188eu/core/rtw_mlme.c | 10 --------
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 13 +---------
4 files changed, 9 insertions(+), 62 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_ap.c b/drivers/staging/rtl8188eu/core/rtw_ap.c
index e611eda11b5f..1c319c2ca86d 100644
--- a/drivers/staging/rtl8188eu/core/rtw_ap.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ap.c
@@ -337,8 +337,6 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level)
unsigned char sta_band = 0, raid, shortGIrate = false;
unsigned int tx_ra_bitmap = 0;
struct ht_priv *psta_ht = NULL;
- struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
- struct wlan_bssid_ex *pcur_network = (struct wlan_bssid_ex *)&pmlmepriv->cur_network.network;
if (psta)
psta_ht = &psta->htpriv;
@@ -363,20 +361,13 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level)
shortGIrate = psta_ht->sgi;
}
- if (pcur_network->Configuration.DSConfig > 14) {
- /* 5G band */
- if (tx_ra_bitmap & 0xffff000)
- sta_band |= WIRELESS_11_5N | WIRELESS_11A;
- else
- sta_band |= WIRELESS_11A;
- } else {
- if (tx_ra_bitmap & 0xffff000)
- sta_band |= WIRELESS_11_24N | WIRELESS_11G | WIRELESS_11B;
- else if (tx_ra_bitmap & 0xff0)
- sta_band |= WIRELESS_11G | WIRELESS_11B;
- else
- sta_band |= WIRELESS_11B;
- }
+ if (tx_ra_bitmap & 0xffff000)
+ sta_band |= WIRELESS_11_24N | WIRELESS_11G | WIRELESS_11B;
+ else if (tx_ra_bitmap & 0xff0)
+ sta_band |= WIRELESS_11G | WIRELESS_11B;
+ else
+ sta_band |= WIRELESS_11B;
+
psta->wireless_mode = sta_band;
diff --git a/drivers/staging/rtl8188eu/core/rtw_debug.c b/drivers/staging/rtl8188eu/core/rtw_debug.c
index 67461fdf315c..6c2fe1a112ac 100644
--- a/drivers/staging/rtl8188eu/core/rtw_debug.c
+++ b/drivers/staging/rtl8188eu/core/rtw_debug.c
@@ -153,13 +153,11 @@ int proc_get_best_channel(char *page, char **start,
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
int len = 0;
- u32 i, best_channel_24G = 1, best_channel_5G = 36, index_24G = 0, index_5G = 0;
+ u32 i, best_channel_24G = 1, index_24G = 0;
for (i = 0; pmlmeext->channel_set[i].ChannelNum != 0; i++) {
if (pmlmeext->channel_set[i].ChannelNum == 1)
index_24G = i;
- if (pmlmeext->channel_set[i].ChannelNum == 36)
- index_5G = i;
}
for (i = 0; pmlmeext->channel_set[i].ChannelNum != 0; i++) {
@@ -171,32 +169,11 @@ int proc_get_best_channel(char *page, char **start,
}
}
- /* 5G */
- if (pmlmeext->channel_set[i].ChannelNum >= 36 &&
- pmlmeext->channel_set[i].ChannelNum < 140) {
- /* Find primary channel */
- if (((pmlmeext->channel_set[i].ChannelNum - 36) % 8 == 0) &&
- (pmlmeext->channel_set[i].rx_count < pmlmeext->channel_set[index_5G].rx_count)) {
- index_5G = i;
- best_channel_5G = pmlmeext->channel_set[i].ChannelNum;
- }
- }
-
- if (pmlmeext->channel_set[i].ChannelNum >= 149 &&
- pmlmeext->channel_set[i].ChannelNum < 165) {
- /* find primary channel */
- if (((pmlmeext->channel_set[i].ChannelNum - 149) % 8 == 0) &&
- (pmlmeext->channel_set[i].rx_count < pmlmeext->channel_set[index_5G].rx_count)) {
- index_5G = i;
- best_channel_5G = pmlmeext->channel_set[i].ChannelNum;
- }
- }
/* debug */
len += snprintf(page + len, count - len, "The rx cnt of channel %3d = %d\n",
pmlmeext->channel_set[i].ChannelNum, pmlmeext->channel_set[i].rx_count);
}
- len += snprintf(page + len, count - len, "best_channel_5G = %d\n", best_channel_5G);
len += snprintf(page + len, count - len, "best_channel_24G = %d\n", best_channel_24G);
*eof = 1;
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
index eca06f05c0c4..b610443f2ac6 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
@@ -1819,16 +1819,6 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter)
case WIRELESS_11BG_24N:
pdev_network->NetworkTypeInUse = Ndis802_11OFDM24;
break;
- case WIRELESS_11A:
- case WIRELESS_11A_5N:
- pdev_network->NetworkTypeInUse = Ndis802_11OFDM5;
- break;
- case WIRELESS_11ABGN:
- if (pregistrypriv->channel > 14)
- pdev_network->NetworkTypeInUse = Ndis802_11OFDM5;
- else
- pdev_network->NetworkTypeInUse = Ndis802_11OFDM24;
- break;
default:
/* TODO */
break;
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index 1115050077e4..213c8d670591 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -2401,10 +2401,7 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid
p++;
for (j = 0; j < noc; j++) {
- if (fcn <= 14)
- channel = fcn + j; /* 2.4 GHz */
- else
- channel = fcn + j*4; /* 5 GHz */
+ channel = fcn + j;
chplan_ap.Channel[i++] = channel;
}
@@ -2481,14 +2478,6 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid
j++;
}
- /* keep original STA 5G channel plan */
- while ((i < MAX_CHANNEL_NUM) && (chplan_sta[i].ChannelNum != 0)) {
- chplan_new[k].ChannelNum = chplan_sta[i].ChannelNum;
- chplan_new[k].ScanType = chplan_sta[i].ScanType;
- i++;
- k++;
- }
-
pmlmeext->update_channel_plan_by_ap_done = 1;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] staging: rtl8188eu: remove code that is valid only for 5 GHz
2018-09-13 20:32 [PATCH] staging: rtl8188eu: remove code that is valid only for 5 GHz Robert Węcławski
@ 2018-09-14 6:12 ` Dan Carpenter
2018-09-14 15:58 ` Robert Węcławski
0 siblings, 1 reply; 4+ messages in thread
From: Dan Carpenter @ 2018-09-14 6:12 UTC (permalink / raw)
To: Robert Węcławski
Cc: gregkh, devel, Kees Cook, Kacper Kołodziej, Mihaela Muraru,
Valentine Sinitsyn, linux-kernel, Hans de Goede,
Janani Sankara Babu, Colin Ian King, Santha Meena Ramamoorthy
On Thu, Sep 13, 2018 at 10:32:39PM +0200, Robert Węcławski wrote:
> diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
> index eca06f05c0c4..b610443f2ac6 100644
> --- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
> +++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
> @@ -1819,16 +1819,6 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter)
> case WIRELESS_11BG_24N:
> pdev_network->NetworkTypeInUse = Ndis802_11OFDM24;
> break;
> - case WIRELESS_11A:
> - case WIRELESS_11A_5N:
> - pdev_network->NetworkTypeInUse = Ndis802_11OFDM5;
> - break;
> - case WIRELESS_11ABGN:
> - if (pregistrypriv->channel > 14)
> - pdev_network->NetworkTypeInUse = Ndis802_11OFDM5;
> - else
> - pdev_network->NetworkTypeInUse = Ndis802_11OFDM24;
> - break;
> default:
> /* TODO */
> break;
Are you sure about this chunk? I would have thought that <= 14 was not
5G. (I try to avoid rhetorical questions and I don't know the answer
here).
regards,
dan carpenter
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] staging: rtl8188eu: remove code that is valid only for 5 GHz
2018-09-14 6:12 ` Dan Carpenter
@ 2018-09-14 15:58 ` Robert Węcławski
2018-09-14 16:52 ` Dan Carpenter
0 siblings, 1 reply; 4+ messages in thread
From: Robert Węcławski @ 2018-09-14 15:58 UTC (permalink / raw)
To: dan.carpenter
Cc: Robert Węcławski, Greg Kroah-Hartman, Michael Straube,
Bhaskar Singh, Kacper Kołodziej, Janani Sankara Babu,
Santha Meena Ramamoorthy, Kees Cook, Manish Shrestha,
Valentine Sinitsyn, Aishwarya Pant, Colin Ian King, Jia-Ju Bai,
devel, linux-kernel
> On Thu, Sep 13, 2018 at 10:32:39PM +0200, Robert Węcławski wrote:
> > diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
> > index eca06f05c0c4..b610443f2ac6 100644
> > --- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
> > +++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
> > @@ -1819,16 +1819,6 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter)
> > case WIRELESS_11BG_24N:
> > pdev_network->NetworkTypeInUse = Ndis802_11OFDM24;
> > break;
> > - case WIRELESS_11A:
> > - case WIRELESS_11A_5N:
> > - pdev_network->NetworkTypeInUse = Ndis802_11OFDM5;
> > - break;
> > - case WIRELESS_11ABGN:
> > - if (pregistrypriv->channel > 14)
> > - pdev_network->NetworkTypeInUse = Ndis802_11OFDM5;
> > - else
> > - pdev_network->NetworkTypeInUse = Ndis802_11OFDM24;
> > - break;
> > default:
> > /* TODO */
> > break;
>
> Are you sure about this chunk? I would have thought that <= 14 was not
> 5G. (I try to avoid rhetorical questions and I don't know the answer
> here).
>
> regards,
> dan carpenter
I'm 99% sure this part is not needed because this chipset only supports B, G and N WiFi networks.
I think we should add pdev_network->NetworkTypeInUse = Ndis802_110FDM5 to default case to be 100% sure it won't break anything.
If we do this we can be sure pdev_network->NetworkTypeInUse will be set.
Should I make a new version of this patch?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] staging: rtl8188eu: remove code that is valid only for 5 GHz
2018-09-14 15:58 ` Robert Węcławski
@ 2018-09-14 16:52 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2018-09-14 16:52 UTC (permalink / raw)
To: Robert Węcławski
Cc: devel, Kees Cook, Greg Kroah-Hartman, Valentine Sinitsyn,
linux-kernel, Kacper Kołodziej, Jia-Ju Bai,
Janani Sankara Babu, Manish Shrestha, Colin Ian King,
Santha Meena Ramamoorthy
On Fri, Sep 14, 2018 at 05:58:58PM +0200, Robert Węcławski wrote:
> > On Thu, Sep 13, 2018 at 10:32:39PM +0200, Robert Węcławski wrote:
> > > diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
> > > index eca06f05c0c4..b610443f2ac6 100644
> > > --- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
> > > +++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
> > > @@ -1819,16 +1819,6 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter)
> > > case WIRELESS_11BG_24N:
> > > pdev_network->NetworkTypeInUse = Ndis802_11OFDM24;
> > > break;
> > > - case WIRELESS_11A:
> > > - case WIRELESS_11A_5N:
> > > - pdev_network->NetworkTypeInUse = Ndis802_11OFDM5;
> > > - break;
> > > - case WIRELESS_11ABGN:
> > > - if (pregistrypriv->channel > 14)
> > > - pdev_network->NetworkTypeInUse = Ndis802_11OFDM5;
> > > - else
> > > - pdev_network->NetworkTypeInUse = Ndis802_11OFDM24;
> > > - break;
> > > default:
> > > /* TODO */
> > > break;
> >
> > Are you sure about this chunk? I would have thought that <= 14 was not
> > 5G. (I try to avoid rhetorical questions and I don't know the answer
> > here).
> >
> > regards,
> > dan carpenter
>
> I'm 99% sure this part is not needed because this chipset only supports B, G and N WiFi networks.
>
> I think we should add pdev_network->NetworkTypeInUse = Ndis802_110FDM5 to default case to be 100% sure it won't break anything.
> If we do this we can be sure pdev_network->NetworkTypeInUse will be set.
> Should I make a new version of this patch?
Yes, please.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-09-14 16:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-13 20:32 [PATCH] staging: rtl8188eu: remove code that is valid only for 5 GHz Robert Węcławski
2018-09-14 6:12 ` Dan Carpenter
2018-09-14 15:58 ` Robert Węcławski
2018-09-14 16:52 ` Dan Carpenter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).