staging: rtl8723au: cfg80211_rtw_mgmt_tx(): type is always -1

Rip out P2P defines since they are effectively never used.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/include/wifi.h b/drivers/staging/rtl8723au/include/wifi.h
index 64ead4f0dc4c7e2b9c14d34a0963d36ccad13143..b0a6ae3bca97f3023d669a817c17caf0a4335382 100644 (file)
--- a/drivers/staging/rtl8723au/include/wifi.h
+++ b/drivers/staging/rtl8723au/include/wifi.h
@@ -235,20 +235,6 @@ struct ADDBA_request {
 #define WPS_ATTR_VENDOR_EXT                    0x1049
 #define WPS_ATTR_SELECTED_REGISTRAR            0x1041
 
-/*     P2P Public Action Frame ( Management Frame ) */
-#define        P2P_PUB_ACTION_ACTION                   0x09
-
-/*     P2P Public Action Frame Type */
-#define        P2P_GO_NEGO_REQ                         0
-#define        P2P_GO_NEGO_RESP                        1
-#define        P2P_GO_NEGO_CONF                        2
-#define        P2P_INVIT_REQ                           3
-#define        P2P_INVIT_RESP                          4
-#define        P2P_DEVDISC_REQ                         5
-#define        P2P_DEVDISC_RESP                        6
-#define        P2P_PROVISION_DISC_REQ                  7
-#define        P2P_PROVISION_DISC_RESP                 8
-
 /*     WPS Configuration Method */
 #define        WPS_CM_NONE                                     0x0000
 #define        WPS_CM_LABEL                                    0x0004

diff --git a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
index 6a99dafa8f8c5daf9b5bc2f657df5917c0595990..5ef72b2aa9a15b753ebd5c6ea3bac1f62e6f3872 100644 (file)
--- a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
@@ -3198,14 +3198,12 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
 {
        struct rtw_adapter *padapter =
                (struct rtw_adapter *)wiphy_to_adapter(wiphy);
-       struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev);
        int ret = 0;
        int tx_ret;
        u32 dump_limit = RTW_MAX_MGMT_TX_CNT;
        u32 dump_cnt = 0;
        bool ack = true;
        u8 category, action;
-       int type = (-1);
        unsigned long start = jiffies;
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0))
        size_t len = params->len;
@@ -3252,23 +3250,6 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
                          dump_limit, jiffies_to_msecs(jiffies - start));
        }
 
-       switch (type) {
-       case P2P_GO_NEGO_CONF:
-               rtw_clear_scan_deny(padapter);
-               break;
-       case P2P_INVIT_RESP:
-               if (pwdev_priv->invit_info.flags & BIT(0)
-                   && pwdev_priv->invit_info.status == 0) {
-                       DBG_8723A("%s(%s): agree with invitation of "
-                                 "persistent group\n",
-                                 __func__, padapter->pnetdev->name);
-                       rtw_set_scan_deny(padapter, 5000);
-                       rtw_pwr_wakeup_ex(padapter, 5000);
-                       rtw_clear_scan_deny(padapter);
-               }
-               break;
-       }
-
 exit:
        return ret;
 }