staging: rtl8192e: Remove mode IW_MODE_ADHOC from rtl_core.c

Remove unsupported mode IW_MODE_ADHOC from rtl_core.c and further files.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/7b9a4790238081736e6530135309e53d36f28574.1695387832.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index cbb082d8b89f22c6739e97b15c74473e212f57b6..03cabf88ce2be3a2ccd8ef65770ea25450069850 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -165,8 +165,7 @@ bool rtl92e_set_rf_state(struct net_device *dev,
 
        case rf_off:
 
-               if ((priv->rtllib->iw_mode == IW_MODE_INFRA) ||
-                   (priv->rtllib->iw_mode == IW_MODE_ADHOC)) {
+               if (priv->rtllib->iw_mode == IW_MODE_INFRA) {
                        if ((priv->rtllib->rf_off_reason > RF_CHANGE_BY_IPS) ||
                            (change_source > RF_CHANGE_BY_IPS)) {
                                if (ieee->link_state == MAC80211_LINKED)
@@ -1088,17 +1087,6 @@ RESET_START:
 
                        schedule_work(&ieee->associate_complete_wq);
 
-               } else if (ieee->link_state == MAC80211_LINKED && ieee->iw_mode ==
-                          IW_MODE_ADHOC) {
-                       ieee->set_chan(ieee->dev,
-                                      ieee->current_network.channel);
-                       ieee->link_change(ieee->dev);
-
-                       notify_wx_assoc_event(ieee);
-
-                       rtllib_start_send_beacons(ieee);
-
-                       netif_carrier_on(ieee->dev);
                }
 
                rtl92e_cam_restore(dev);

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index dbf765d601b3c172bfab8267e3ffa738e5cd5508..561ea68de56abb932170c8882ec4fa3426d895f6 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -1405,8 +1405,6 @@ static void _rtl92e_dm_check_edca_turbo(struct net_device *dev)
        unsigned long curTxOkCnt = 0;
        unsigned long curRxOkCnt = 0;
 
-       if (priv->rtllib->iw_mode == IW_MODE_ADHOC)
-               goto dm_CheckEdcaTurbo_EXIT;
        if (priv->rtllib->link_state != MAC80211_LINKED)
                goto dm_CheckEdcaTurbo_EXIT;
        if (priv->rtllib->ht_info->iot_action & HT_IOT_ACT_DISABLE_EDCA_TURBO)

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
index 598bfc0ff3d187a7ee01178ee446e26ea7271c07..a4da1162719996ad5609cc69a06c29198455f913 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
@@ -181,9 +181,6 @@ static bool _rtl92e_ps_set_mode(struct net_device *dev, u8 rtPsMode)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
 
-       if (priv->rtllib->iw_mode == IW_MODE_ADHOC)
-               return false;
-
        if (!priv->ps_force)
                priv->rtllib->ps = rtPsMode;
        if (priv->rtllib->sta_sleep != LPS_IS_WAKE &&
@@ -208,8 +205,7 @@ void rtl92e_leisure_ps_enter(struct net_device *dev)
                                        &priv->rtllib->pwr_save_ctrl;
 
        if (!((priv->rtllib->iw_mode == IW_MODE_INFRA) &&
-           (priv->rtllib->link_state == MAC80211_LINKED))
-           || (priv->rtllib->iw_mode == IW_MODE_ADHOC))
+           (priv->rtllib->link_state == MAC80211_LINKED)))
                return;
 
        if (psc->bLeisurePs) {

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
index 1897988525686a422fc825b07f279b38d930ca29..17e7fcc01f707d65da9ec1dbaf24c42260d2806e 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
@@ -250,7 +250,7 @@ static int _rtl92e_wx_set_mode(struct net_device *dev,
                return 0;
        rt_state = priv->rtllib->rf_power_state;
        mutex_lock(&priv->wx_mutex);
-       if (wrqu->mode == IW_MODE_ADHOC || wrqu->mode == IW_MODE_MONITOR ||
+       if (wrqu->mode == IW_MODE_MONITOR ||
            ieee->net_promiscuous_md) {
                if (rt_state == rf_off) {
                        if (priv->rtllib->rf_off_reason >
@@ -844,8 +844,7 @@ static int _rtl92e_wx_set_encode_ext(struct net_device *dev,
                        idx--;
                group = ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY;
 
-               if ((!group) || (ieee->iw_mode == IW_MODE_ADHOC) ||
-                   (alg ==  KEY_TYPE_WEP40)) {
+               if ((!group) || (alg ==  KEY_TYPE_WEP40)) {
                        if ((ext->key_len == 13) && (alg == KEY_TYPE_WEP40))
                                alg = KEY_TYPE_WEP104;
                        ieee->pairwise_key_type = alg;

diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
index 48703d93df308fec8f0e7440af5348ed27b348ef..2b15251201eca17308c0032e52eaf98830a13fe6 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
@@ -50,12 +50,6 @@ int rtllib_wx_set_freq(struct rtllib_device *ieee, struct iw_request_info *a,
                }
                ieee->current_network.channel = fwrq->m;
                ieee->set_chan(ieee->dev, ieee->current_network.channel);
-
-               if (ieee->iw_mode == IW_MODE_ADHOC)
-                       if (ieee->link_state == MAC80211_LINKED) {
-                               rtllib_stop_send_beacons(ieee);
-                               rtllib_start_send_beacons(ieee);
-                       }
        }
 
        ret = 0;
@@ -360,9 +354,6 @@ void rtllib_wx_sync_scan_wq(void *data)
                ieee->link_detect_info.NumRecvBcnInPeriod = 1;
                ieee->link_detect_info.NumRecvDataInPeriod = 1;
        }
-       if (ieee->iw_mode == IW_MODE_ADHOC)
-               rtllib_start_send_beacons(ieee);
-
        rtllib_wake_all_queues(ieee);
 
 out: