Skip to contentSkip to conversation

staging: r8188eu: remove 5 GHz code

PATCH In review Michael Straube 3 participants 3 messages Aug 23, 2021 Staging

lore
Share & tools
lore

Michael Straube

author
#0 lore raw

PATCH 1/1 staging: r8188eu: remove 5 GHz code

The driver is for chips that do not operate in the 5 GHz band. Remove some 5 GHz related code.

Signed-off-by Michael Straube <[email protected]>
---
 drivers/staging/r8188eu/os_dep/ioctl_linux.c | 30 ++++++--------------
 1 file changed, 8 insertions(+), 22 deletions(-)
drivers/staging/r8188eu/os_dep/ioctl_linux.c +8 -22
index ab4a9200f079..81d4255d1785 100644
@@ -208,17 +208,10 @@ static char *translate_scan(struct adapter *padapter,
 		else
 			snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bg");
 	} else {
-		if (pnetwork->network.Configuration.DSConfig > 14) {
-			if (ht_cap)
-				snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11an");
-			else
-				snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11a");
-		} else {
-			if (ht_cap)
-				snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11gn");
-			else
-				snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11g");
-		}
+		if (ht_cap)
+			snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11gn");
+		else
+			snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11g");
 	}
 
 	start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_CHAR_LEN);

@@ -737,17 +730,10 @@ static int rtw_wx_get_name(struct net_device *dev,
 			else
 				snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11bg");
 		} else {
-			if (pcur_bss->Configuration.DSConfig > 14) {
-				if (ht_cap)
-					snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11an");
-				else
-					snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11a");
-			} else {
-				if (ht_cap)
-					snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11gn");
-				else
-					snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11g");
-			}
+			if (ht_cap)
+				snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11gn");
+			else
+				snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11g");
 		}
 	} else {
 		snprintf(wrqu->name, IFNAMSIZ, "unassociated");
Signature · 1 line
2.32.0
Acked-by on v1 1/1
#1 lore raw

Thus wrote Michael Straube ([email protected]):

Quoted 58 lines

The driver is for chips that do not operate in the 5 GHz band. Remove some 5 GHz related code.

Signed-off-by Michael Straube <[email protected]>
---
 drivers/staging/r8188eu/os_dep/ioctl_linux.c | 30 ++++++--------------
 1 file changed, 8 insertions(+), 22 deletions(-)
drivers/staging/r8188eu/os_dep/ioctl_linux.c +8 -22
index ab4a9200f079..81d4255d1785 100644
@@ -208,17 +208,10 @@ static char *translate_scan(struct adapter *padapter,
 		else
 			snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bg");
 	} else {
-		if (pnetwork->network.Configuration.DSConfig > 14) {
-			if (ht_cap)
-				snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11an");
-			else
-				snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11a");
-		} else {
-			if (ht_cap)
-				snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11gn");
-			else
-				snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11g");
-		}
+		if (ht_cap)
+			snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11gn");
+		else
+			snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11g");
 	}
 
 	start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_CHAR_LEN);

@@ -737,17 +730,10 @@ static int rtw_wx_get_name(struct net_device *dev,
 			else
 				snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11bg");
 		} else {
-			if (pcur_bss->Configuration.DSConfig > 14) {
-				if (ht_cap)
-					snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11an");
-				else
-					snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11a");
-			} else {
-				if (ht_cap)
-					snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11gn");
-				else
-					snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11g");
-			}
+			if (ht_cap)
+				snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11gn");
+			else
+				snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11g");
 		}
 	} else {
 		snprintf(wrqu->name, IFNAMSIZ, "unassociated");
Signature · 1 line
2.32.0

Hi Michael and all,

looks good.

Acked-by Martin Kaiser <[email protected]>

Two comments unrelated to your patch: I guess that DSConfig is the channel number, those two drivers have a misleading comment:

3 F m DSConfig
drivers/staging/r8188eu/include/wlan_bssdef.h
struct:ndis_802_11_config
u32 DSConfig; /* Frequency, units are kHz */
4 F m DSConfig drivers/staging/rtl8712/wlan_bssdef.h
struct:NDIS_802_11_CONFIGURATION
u32 DSConfig; /* Frequency, units are kHz */

The rtw_wx_get_name function has a similar check
if (pcur_bss->Configuration.DSConfig > 14).

But when Larry adds cfg80211 support, I guess all IW_HANDLER()s will become obsolete...

Best regards,
Martin

Acked-by on v1 1/1
#2 lore raw
In reply to Michael Straube
Quoted 58 lines · Michael Straube

The driver is for chips that do not operate in the 5 GHz band. Remove some 5 GHz related code.

Signed-off-by Michael Straube <[email protected]>
---
 drivers/staging/r8188eu/os_dep/ioctl_linux.c | 30 ++++++--------------
 1 file changed, 8 insertions(+), 22 deletions(-)
drivers/staging/r8188eu/os_dep/ioctl_linux.c +8 -23
index ab4a9200f079..81d4255d1785 100644
@@ -208,17 +208,10 @@ static char *translate_scan(struct adapter *padapter,
                else
                        snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bg");
        } else {
-               if (pnetwork->network.Configuration.DSConfig > 14) {
-                       if (ht_cap)
-                               snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11an");
-                       else
-                               snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11a");
-               } else {
-                       if (ht_cap)
-                               snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11gn");
-                       else
-                               snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11g");
-               }
+               if (ht_cap)
+                       snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11gn");
+               else
+                       snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11g");
        }
 
        start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_CHAR_LEN);

@@ -737,17 +730,10 @@ static int rtw_wx_get_name(struct net_device *dev,
                        else
                                snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11bg");
                } else {
-                       if (pcur_bss->Configuration.DSConfig > 14) {
-                               if (ht_cap)
-                                       snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11an");
-                               else
-                                       snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11a");
-                       } else {
-                               if (ht_cap)
-                                       snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11gn");
-                               else
-                                       snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11g");
-                       }
+                       if (ht_cap)
+                               snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11gn");
+                       else
+                               snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11g");
                }
        } else {
                snprintf(wrqu->name, IFNAMSIZ, "unassociated");
--
Quoted 2 lines

2.32.0

Dear Michael,

Looks good to me. Thanks.

Acked-by Phillip Potter <[email protected]>

Regards,
Phil