staging: wilc1000: use macro from ieee80211.h in register frame api's

Make use of ieee80211.h provided macros and removed the extra macro
defined for the same purpose.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 2bf91df1ded1131f35f43419475753b4697909fd..eb13b412f5e418159f997fb14e0ed660e684ba50 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3483,11 +3483,11 @@ void wilc_frame_register(struct wilc_vif *vif, u16 frame_type, bool reg)
                return;
 
        switch (frame_type) {
-       case ACTION:
+       case IEEE80211_STYPE_ACTION:
                msg->body.reg_frame.reg_id = ACTION_FRM_IDX;
                break;
 
-       case PROBE_REQ:
+       case IEEE80211_STYPE_PROBE_REQ:
                msg->body.reg_frame.reg_id = PROBE_REQ_IDX;
                break;
 

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 523b46bfb48854ad8ca2d949503cf5813dc3ac3f..0185fc6cd90dba78654ddb40ab3b0f82f142b0f3 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -14,9 +14,6 @@
 #define STATION_MODE   0x02
 #define GO_MODE                0x03
 #define CLIENT_MODE    0x04
-#define ACTION         0xD0
-#define PROBE_REQ      0x40
-#define PROBE_RESP     0x50
 
 #define ACTION_FRM_IDX                         0
 #define PROBE_REQ_IDX                          1

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index a6f4fad43bf7ad40240dd3e1a06f01bf2016b5a8..f92ecf6c19ba635055141444532cb3d6b1f6c32e 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1700,12 +1700,12 @@ void wilc_mgmt_frame_register(struct wiphy *wiphy, struct wireless_dev *wdev,
                return;
 
        switch (frame_type) {
-       case PROBE_REQ:
+       case IEEE80211_STYPE_PROBE_REQ:
                vif->frame_reg[0].type = frame_type;
                vif->frame_reg[0].reg = reg;
                break;
 
-       case ACTION:
+       case IEEE80211_STYPE_ACTION:
                vif->frame_reg[1].type = frame_type;
                vif->frame_reg[1].reg = reg;
                break;