diff options
| author | Mark Brown <broonie@kernel.org> | 2020-12-28 17:20:00 +0300 | 
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-12-28 17:20:00 +0300 | 
| commit | 2ae6f64ce1ce304b502461fdfe0b96c8171ae2cc (patch) | |
| tree | 88e987c447daf2c29e2d4c15e58d1029b0cc78c2 /drivers/net/wireless/ath/carl9170/mac.c | |
| parent | 3b66e4a8e58a85af3212c7117d7a29c9ef6679a2 (diff) | |
| parent | 5c8fe583cce542aa0b84adc939ce85293de36e5e (diff) | |
| download | linux-2ae6f64ce1ce304b502461fdfe0b96c8171ae2cc.tar.xz | |
Merge tag 'v5.11-rc1' into regulator-5.11
Linux 5.11-rc1
Diffstat (limited to 'drivers/net/wireless/ath/carl9170/mac.c')
| -rw-r--r-- | drivers/net/wireless/ath/carl9170/mac.c | 4 | 
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/carl9170/mac.c b/drivers/net/wireless/ath/carl9170/mac.c index b2eeb9fd68d2..6cdbee5beb07 100644 --- a/drivers/net/wireless/ath/carl9170/mac.c +++ b/drivers/net/wireless/ath/carl9170/mac.c @@ -329,10 +329,6 @@ int carl9170_set_operating_mode(struct ar9170 *ar)  			/* iwlagn 802.11n STA Workaround */  			rx_ctrl |= AR9170_MAC_RX_CTRL_PASS_TO_HOST;  			break; -		case NL80211_IFTYPE_WDS: -			cam_mode |= AR9170_MAC_CAM_AP_WDS; -			rx_ctrl |= AR9170_MAC_RX_CTRL_PASS_TO_HOST; -			break;  		case NL80211_IFTYPE_STATION:  			cam_mode |= AR9170_MAC_CAM_STA;  			rx_ctrl |= AR9170_MAC_RX_CTRL_PASS_TO_HOST;  | 
