diff mbox

hostapd: Remove unnecessary condition checking for opmode.

Message ID 1404461684-26311-1-git-send-email-marek.kwaczynski@tieto.com
State Superseded
Headers show

Commit Message

Marek Kwaczynski July 4, 2014, 8:14 a.m. UTC 
Signed-hostap: Marek Kwaczynski <marek.kwaczynski@tieto.com>
---
 src/ap/ieee802_11_vht.c |   10 ----------
 1 file changed, 10 deletions(-)

Comments

Jouni Malinen July 4, 2014, 8:58 a.m. UTC | #1 
On Fri, Jul 04, 2014 at 10:14:44AM +0200, Marek Kwaczynski wrote:
> diff --git a/src/ap/ieee802_11_vht.c b/src/ap/ieee802_11_vht.c
> @@ -121,16 +121,6 @@ u16 set_sta_vht_opmode(struct hostapd_data *hapd, struct sta_info *sta,
>  	channel_width = *vht_oper_notif & VHT_OPMODE_CHANNEL_WIDTH_MASK;
>  
> -	if (channel_width != VHT_CHANWIDTH_USE_HT &&

..

That channel_width is dead code after this removal.. Anyway, commit
35cbadbb14b3c60b737f85940468ad6cfe0f05ad already removed this couple of
weeks ago.
diff mbox

Patch

diff --git a/src/ap/ieee802_11_vht.c b/src/ap/ieee802_11_vht.c
index 221d9c2..c33aa18 100644
--- a/src/ap/ieee802_11_vht.c
+++ b/src/ap/ieee802_11_vht.c
@@ -121,16 +121,6 @@  u16 set_sta_vht_opmode(struct hostapd_data *hapd, struct sta_info *sta,
 
 	channel_width = *vht_oper_notif & VHT_OPMODE_CHANNEL_WIDTH_MASK;
 
-	if (channel_width != VHT_CHANWIDTH_USE_HT &&
-	    channel_width != VHT_CHANWIDTH_80MHZ &&
-	    channel_width != VHT_CHANWIDTH_160MHZ &&
-	    channel_width != VHT_CHANWIDTH_80P80MHZ &&
-	    ((*vht_oper_notif & VHT_OPMODE_CHANNEL_RxNSS_MASK) >>
-	     VHT_OPMODE_NOTIF_RX_NSS_SHIFT) > VHT_RX_NSS_MAX_STREAMS - 1) {
-		sta->flags &= ~WLAN_STA_VHT_OPMODE_ENABLED;
-		return WLAN_STATUS_UNSPECIFIED_FAILURE;
-	}
-
 	sta->flags |= WLAN_STA_VHT_OPMODE_ENABLED;
 	sta->vht_opmode = *vht_oper_notif;
 	return WLAN_STATUS_SUCCESS;