carl9170: remove WDS code

The ability to reach this code was hidden behind
CONFIG_WIRELESS_WDS, which was just removed. Clean
up the driver accordingly.

Link: https://lore.kernel.org/r/20201109105103.1e9c64789510.Ifc4f55c8099e7b7c31a8059befe102523d65e945@changeid
Acked-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/ath/carl9170/mac.c b/drivers/net/wireless/ath/carl9170/mac.c
index b2eeb9fd68d2a7df661e522511814fe268f43a34..6cdbee5beb077a0a4010d863f456f298885ee227 100644 (file)
--- 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;

diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c
index dbef9d8fc893b7350bccfd7b5b34fbdbf99ac9f5..cca3b086aa701ffd757f404fcff1583a2d34ef68 100644 (file)
--- a/drivers/net/wireless/ath/carl9170/main.c
+++ b/drivers/net/wireless/ath/carl9170/main.c
@@ -646,7 +646,6 @@ static int carl9170_op_add_interface(struct ieee80211_hw *hw,
                case NL80211_IFTYPE_MESH_POINT:
                case NL80211_IFTYPE_AP:
                        if ((vif->type == NL80211_IFTYPE_STATION) ||
-                           (vif->type == NL80211_IFTYPE_WDS) ||
                            (vif->type == NL80211_IFTYPE_AP) ||
                            (vif->type == NL80211_IFTYPE_MESH_POINT))
                                break;