* [PATCH 1/9] staging: r8188eu: action category ht is not used
2022-05-02 20:06 [PATCH 0/9] staging: r8188eu: clean up OnAction Martin Kaiser
@ 2022-05-02 20:06 ` Martin Kaiser
2022-05-02 20:06 ` [PATCH 2/9] staging: r8188eu: action category wmm " Martin Kaiser
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Martin Kaiser @ 2022-05-02 20:06 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
linux-kernel, Martin Kaiser
The r8188eu driver does not handle the ht action category. Remove the
empty handler function, the entry in OnAction_tbl and the define for the
category.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/core/rtw_mlme_ext.c | 6 ------
drivers/staging/r8188eu/include/ieee80211.h | 1 -
drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 --
3 files changed, 9 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 839b0b85993e..01fcd996e192 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -35,7 +35,6 @@ static mlme_handler mlme_sta_tbl[] = {
static struct action_handler OnAction_tbl[] = {
{RTW_WLAN_CATEGORY_BACK, "ACTION_BACK", &OnAction_back},
{RTW_WLAN_CATEGORY_PUBLIC, "ACTION_PUBLIC", on_action_public},
- {RTW_WLAN_CATEGORY_HT, "ACTION_HT", &OnAction_ht},
{RTW_WLAN_CATEGORY_WMM, "ACTION_WMM", &OnAction_wmm},
{RTW_WLAN_CATEGORY_P2P, "ACTION_P2P", &OnAction_p2p},
};
@@ -3837,11 +3836,6 @@ unsigned int on_action_public(struct adapter *padapter, struct recv_frame *precv
return ret;
}
-unsigned int OnAction_ht(struct adapter *padapter, struct recv_frame *precv_frame)
-{
- return _SUCCESS;
-}
-
unsigned int OnAction_wmm(struct adapter *padapter, struct recv_frame *precv_frame)
{
return _SUCCESS;
diff --git a/drivers/staging/r8188eu/include/ieee80211.h b/drivers/staging/r8188eu/include/ieee80211.h
index fe2dc2a0a802..0dd7da912891 100644
--- a/drivers/staging/r8188eu/include/ieee80211.h
+++ b/drivers/staging/r8188eu/include/ieee80211.h
@@ -598,7 +598,6 @@ static inline int is_broadcast_mac_addr(const u8 *addr)
enum rtw_ieee80211_category {
RTW_WLAN_CATEGORY_BACK = 3,
RTW_WLAN_CATEGORY_PUBLIC = 4, /* IEEE 802.11 public action frames */
- RTW_WLAN_CATEGORY_HT = 7,
RTW_WLAN_CATEGORY_TDLS = 12,
RTW_WLAN_CATEGORY_WMM = 17,
RTW_WLAN_CATEGORY_P2P = 0x7f,/* P2P action frames */
diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
index dcf91e7894a5..0deb6c963d0c 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
@@ -577,8 +577,6 @@ unsigned int OnAction_back(struct adapter *padapter,
struct recv_frame *precv_frame);
unsigned int on_action_public(struct adapter *padapter,
struct recv_frame *precv_frame);
-unsigned int OnAction_ht(struct adapter *padapter,
- struct recv_frame *precv_frame);
unsigned int OnAction_wmm(struct adapter *padapter,
struct recv_frame *precv_frame);
unsigned int OnAction_p2p(struct adapter *padapter,
--
2.30.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/9] staging: r8188eu: action category wmm is not used
2022-05-02 20:06 [PATCH 0/9] staging: r8188eu: clean up OnAction Martin Kaiser
2022-05-02 20:06 ` [PATCH 1/9] staging: r8188eu: action category ht is not used Martin Kaiser
@ 2022-05-02 20:06 ` Martin Kaiser
2022-05-02 20:06 ` [PATCH 3/9] staging: r8188eu: remove unused action handler prototypes Martin Kaiser
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Martin Kaiser @ 2022-05-02 20:06 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
linux-kernel, Martin Kaiser
The r8188eu driver does not handle the wmm action category. Remove the
empty handler function, the entry in OnAction_tbl and the define for the
category.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/core/rtw_mlme_ext.c | 6 ------
drivers/staging/r8188eu/include/ieee80211.h | 1 -
drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 --
3 files changed, 9 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 01fcd996e192..a581930b05df 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -35,7 +35,6 @@ static mlme_handler mlme_sta_tbl[] = {
static struct action_handler OnAction_tbl[] = {
{RTW_WLAN_CATEGORY_BACK, "ACTION_BACK", &OnAction_back},
{RTW_WLAN_CATEGORY_PUBLIC, "ACTION_PUBLIC", on_action_public},
- {RTW_WLAN_CATEGORY_WMM, "ACTION_WMM", &OnAction_wmm},
{RTW_WLAN_CATEGORY_P2P, "ACTION_P2P", &OnAction_p2p},
};
@@ -3836,11 +3835,6 @@ unsigned int on_action_public(struct adapter *padapter, struct recv_frame *precv
return ret;
}
-unsigned int OnAction_wmm(struct adapter *padapter, struct recv_frame *precv_frame)
-{
- return _SUCCESS;
-}
-
unsigned int OnAction_p2p(struct adapter *padapter, struct recv_frame *precv_frame)
{
u8 *frame_body;
diff --git a/drivers/staging/r8188eu/include/ieee80211.h b/drivers/staging/r8188eu/include/ieee80211.h
index 0dd7da912891..f9a8aa243877 100644
--- a/drivers/staging/r8188eu/include/ieee80211.h
+++ b/drivers/staging/r8188eu/include/ieee80211.h
@@ -599,7 +599,6 @@ enum rtw_ieee80211_category {
RTW_WLAN_CATEGORY_BACK = 3,
RTW_WLAN_CATEGORY_PUBLIC = 4, /* IEEE 802.11 public action frames */
RTW_WLAN_CATEGORY_TDLS = 12,
- RTW_WLAN_CATEGORY_WMM = 17,
RTW_WLAN_CATEGORY_P2P = 0x7f,/* P2P action frames */
};
diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
index 0deb6c963d0c..c68b3c77c378 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
@@ -577,8 +577,6 @@ unsigned int OnAction_back(struct adapter *padapter,
struct recv_frame *precv_frame);
unsigned int on_action_public(struct adapter *padapter,
struct recv_frame *precv_frame);
-unsigned int OnAction_wmm(struct adapter *padapter,
- struct recv_frame *precv_frame);
unsigned int OnAction_p2p(struct adapter *padapter,
struct recv_frame *precv_frame);
--
2.30.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 3/9] staging: r8188eu: remove unused action handler prototypes
2022-05-02 20:06 [PATCH 0/9] staging: r8188eu: clean up OnAction Martin Kaiser
2022-05-02 20:06 ` [PATCH 1/9] staging: r8188eu: action category ht is not used Martin Kaiser
2022-05-02 20:06 ` [PATCH 2/9] staging: r8188eu: action category wmm " Martin Kaiser
@ 2022-05-02 20:06 ` Martin Kaiser
2022-05-02 20:06 ` [PATCH 4/9] staging: r8188eu: remove action_handler string Martin Kaiser
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Martin Kaiser @ 2022-05-02 20:06 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
linux-kernel, Martin Kaiser
For some action categories, we removed the handler function, but we forgot
the prototypes. Remove them as well.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/include/rtw_mlme_ext.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
index c68b3c77c378..136879a0a0f9 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
@@ -567,12 +567,6 @@ unsigned int OnDeAuth(struct adapter *padapter,
unsigned int OnAction(struct adapter *padapter,
struct recv_frame *precv_frame);
-unsigned int on_action_spct(struct adapter *padapter,
- struct recv_frame *precv_frame);
-unsigned int OnAction_qos(struct adapter *padapter,
- struct recv_frame *precv_frame);
-unsigned int OnAction_dls(struct adapter *padapter,
- struct recv_frame *precv_frame);
unsigned int OnAction_back(struct adapter *padapter,
struct recv_frame *precv_frame);
unsigned int on_action_public(struct adapter *padapter,
--
2.30.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 4/9] staging: r8188eu: remove action_handler string
2022-05-02 20:06 [PATCH 0/9] staging: r8188eu: clean up OnAction Martin Kaiser
` (2 preceding siblings ...)
2022-05-02 20:06 ` [PATCH 3/9] staging: r8188eu: remove unused action handler prototypes Martin Kaiser
@ 2022-05-02 20:06 ` Martin Kaiser
2022-05-02 20:06 ` [PATCH 5/9] staging: r8188eu: remove an unused category define Martin Kaiser
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Martin Kaiser @ 2022-05-02 20:06 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
linux-kernel, Martin Kaiser
Remove the unused str component from struct action_handler and the
corresponding entries in OnAction_tbl.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/core/rtw_mlme_ext.c | 6 +++---
drivers/staging/r8188eu/include/rtw_mlme_ext.h | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index a581930b05df..9c83a74f0795 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -33,9 +33,9 @@ static mlme_handler mlme_sta_tbl[] = {
};
static struct action_handler OnAction_tbl[] = {
- {RTW_WLAN_CATEGORY_BACK, "ACTION_BACK", &OnAction_back},
- {RTW_WLAN_CATEGORY_PUBLIC, "ACTION_PUBLIC", on_action_public},
- {RTW_WLAN_CATEGORY_P2P, "ACTION_P2P", &OnAction_p2p},
+ {RTW_WLAN_CATEGORY_BACK, &OnAction_back},
+ {RTW_WLAN_CATEGORY_PUBLIC, on_action_public},
+ {RTW_WLAN_CATEGORY_P2P, &OnAction_p2p},
};
static u8 null_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};
diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
index 136879a0a0f9..63e4ee8e3dfb 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
@@ -188,7 +188,6 @@ typedef unsigned int (*mlme_handler)(struct adapter *adapt, struct recv_frame *f
struct action_handler {
unsigned int num;
- char* str;
unsigned int (*func)(struct adapter *adapt, struct recv_frame *frame);
};
--
2.30.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 5/9] staging: r8188eu: remove an unused category define
2022-05-02 20:06 [PATCH 0/9] staging: r8188eu: clean up OnAction Martin Kaiser
` (3 preceding siblings ...)
2022-05-02 20:06 ` [PATCH 4/9] staging: r8188eu: remove action_handler string Martin Kaiser
@ 2022-05-02 20:06 ` Martin Kaiser
2022-05-02 20:06 ` [PATCH 6/9] staging: r8188eu: replace OnAction_tbl with switch-case Martin Kaiser
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Martin Kaiser @ 2022-05-02 20:06 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
linux-kernel, Martin Kaiser
RTW_WLAN_CATEGORY_TDLS is not used. Remove the define.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/include/ieee80211.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/r8188eu/include/ieee80211.h b/drivers/staging/r8188eu/include/ieee80211.h
index f9a8aa243877..c593f9278868 100644
--- a/drivers/staging/r8188eu/include/ieee80211.h
+++ b/drivers/staging/r8188eu/include/ieee80211.h
@@ -598,7 +598,6 @@ static inline int is_broadcast_mac_addr(const u8 *addr)
enum rtw_ieee80211_category {
RTW_WLAN_CATEGORY_BACK = 3,
RTW_WLAN_CATEGORY_PUBLIC = 4, /* IEEE 802.11 public action frames */
- RTW_WLAN_CATEGORY_TDLS = 12,
RTW_WLAN_CATEGORY_P2P = 0x7f,/* P2P action frames */
};
--
2.30.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 6/9] staging: r8188eu: replace OnAction_tbl with switch-case
2022-05-02 20:06 [PATCH 0/9] staging: r8188eu: clean up OnAction Martin Kaiser
` (4 preceding siblings ...)
2022-05-02 20:06 ` [PATCH 5/9] staging: r8188eu: remove an unused category define Martin Kaiser
@ 2022-05-02 20:06 ` Martin Kaiser
2022-05-02 20:06 ` [PATCH 7/9] staging: r8188eu: use ieee80211_mgmt for action category Martin Kaiser
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Martin Kaiser @ 2022-05-02 20:06 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
linux-kernel, Martin Kaiser
OnAction_tbl has only three entries. It's simpler to use a switch
statement instead of iterating over the table.
We can then remove the table itself and struct action_handler, which was
used only for the table entries.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/core/rtw_mlme_ext.c | 22 +++++++++----------
.../staging/r8188eu/include/rtw_mlme_ext.h | 5 -----
2 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 9c83a74f0795..0df89bbdb63a 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -32,12 +32,6 @@ static mlme_handler mlme_sta_tbl[] = {
OnAction,
};
-static struct action_handler OnAction_tbl[] = {
- {RTW_WLAN_CATEGORY_BACK, &OnAction_back},
- {RTW_WLAN_CATEGORY_PUBLIC, on_action_public},
- {RTW_WLAN_CATEGORY_P2P, &OnAction_p2p},
-};
-
static u8 null_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};
/**************************************************
@@ -3877,9 +3871,7 @@ unsigned int OnAction_p2p(struct adapter *padapter, struct recv_frame *precv_fra
unsigned int OnAction(struct adapter *padapter, struct recv_frame *precv_frame)
{
- int i;
unsigned char category;
- struct action_handler *ptable;
unsigned char *frame_body;
u8 *pframe = precv_frame->rx_data;
@@ -3887,10 +3879,16 @@ unsigned int OnAction(struct adapter *padapter, struct recv_frame *precv_frame)
category = frame_body[0];
- for (i = 0; i < ARRAY_SIZE(OnAction_tbl); i++) {
- ptable = &OnAction_tbl[i];
- if (category == ptable->num)
- ptable->func(padapter, precv_frame);
+ switch (category) {
+ case RTW_WLAN_CATEGORY_BACK:
+ OnAction_back(padapter, precv_frame);
+ break;
+ case RTW_WLAN_CATEGORY_PUBLIC:
+ on_action_public(padapter, precv_frame);
+ break;
+ case RTW_WLAN_CATEGORY_P2P:
+ OnAction_p2p(padapter, precv_frame);
+ break;
}
return _SUCCESS;
}
diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
index 63e4ee8e3dfb..888b12a9f755 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
@@ -186,11 +186,6 @@ enum SCAN_STATE {
typedef unsigned int (*mlme_handler)(struct adapter *adapt, struct recv_frame *frame);
-struct action_handler {
- unsigned int num;
- unsigned int (*func)(struct adapter *adapt, struct recv_frame *frame);
-};
-
struct ss_res {
int state;
int bss_cnt;
--
2.30.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 7/9] staging: r8188eu: use ieee80211_mgmt for action category
2022-05-02 20:06 [PATCH 0/9] staging: r8188eu: clean up OnAction Martin Kaiser
` (5 preceding siblings ...)
2022-05-02 20:06 ` [PATCH 6/9] staging: r8188eu: replace OnAction_tbl with switch-case Martin Kaiser
@ 2022-05-02 20:06 ` Martin Kaiser
2022-05-02 20:06 ` [PATCH 8/9] staging: r8188eu: use standard category defines Martin Kaiser
2022-05-02 20:06 ` [PATCH 9/9] staging: r8188eu: remove unused IEEE_* defines Martin Kaiser
8 siblings, 0 replies; 10+ messages in thread
From: Martin Kaiser @ 2022-05-02 20:06 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
linux-kernel, Martin Kaiser
Use the struct ieee80211_mgmt from ieee80211.h to read the action
category. There's no need to parse the incoming frame ourselves.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/core/rtw_mlme_ext.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 0df89bbdb63a..96b0da90c2ba 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -3871,15 +3871,9 @@ unsigned int OnAction_p2p(struct adapter *padapter, struct recv_frame *precv_fra
unsigned int OnAction(struct adapter *padapter, struct recv_frame *precv_frame)
{
- unsigned char category;
- unsigned char *frame_body;
- u8 *pframe = precv_frame->rx_data;
-
- frame_body = (unsigned char *)(pframe + sizeof(struct ieee80211_hdr_3addr));
-
- category = frame_body[0];
+ struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)precv_frame->rx_data;
- switch (category) {
+ switch (mgmt->u.action.category) {
case RTW_WLAN_CATEGORY_BACK:
OnAction_back(padapter, precv_frame);
break;
--
2.30.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 8/9] staging: r8188eu: use standard category defines
2022-05-02 20:06 [PATCH 0/9] staging: r8188eu: clean up OnAction Martin Kaiser
` (6 preceding siblings ...)
2022-05-02 20:06 ` [PATCH 7/9] staging: r8188eu: use ieee80211_mgmt for action category Martin Kaiser
@ 2022-05-02 20:06 ` Martin Kaiser
2022-05-02 20:06 ` [PATCH 9/9] staging: r8188eu: remove unused IEEE_* defines Martin Kaiser
8 siblings, 0 replies; 10+ messages in thread
From: Martin Kaiser @ 2022-05-02 20:06 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
linux-kernel, Martin Kaiser
Replace some of the driver-specific defines for action categories with the
defines from ieee80211.h.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/core/rtw_mlme_ext.c | 24 ++++++++++-----------
drivers/staging/r8188eu/core/rtw_p2p.c | 4 ++--
drivers/staging/r8188eu/include/ieee80211.h | 2 --
3 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 96b0da90c2ba..848b5051aa13 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -1494,7 +1494,7 @@ unsigned int OnAction_back(struct adapter *padapter, struct recv_frame *precv_fr
frame_body = (unsigned char *)(pframe + sizeof(struct ieee80211_hdr_3addr));
category = frame_body[0];
- if (category == RTW_WLAN_CATEGORY_BACK) { /* representing Block Ack */
+ if (category == WLAN_CATEGORY_BACK) { /* representing Block Ack */
if (!pmlmeinfo->HT_enable)
return _SUCCESS;
action = frame_body[1];
@@ -1551,7 +1551,7 @@ static int get_reg_classes_full_count(struct p2p_channels *channel_list)
void issue_p2p_GO_request(struct adapter *padapter, u8 *raddr)
{
- unsigned char category = RTW_WLAN_CATEGORY_PUBLIC;
+ unsigned char category = WLAN_CATEGORY_PUBLIC;
u8 action = P2P_PUB_ACTION_ACTION;
__be32 p2poui = cpu_to_be32(P2POUI);
u8 oui_subtype = P2P_GO_NEGO_REQ;
@@ -1881,7 +1881,7 @@ void issue_p2p_GO_request(struct adapter *padapter, u8 *raddr)
static void issue_p2p_GO_response(struct adapter *padapter, u8 *raddr, u8 *frame_body, uint len, u8 result)
{
- unsigned char category = RTW_WLAN_CATEGORY_PUBLIC;
+ unsigned char category = WLAN_CATEGORY_PUBLIC;
u8 action = P2P_PUB_ACTION_ACTION;
__be32 p2poui = cpu_to_be32(P2POUI);
u8 oui_subtype = P2P_GO_NEGO_RESP;
@@ -2243,7 +2243,7 @@ static void issue_p2p_GO_response(struct adapter *padapter, u8 *raddr, u8 *frame
static void issue_p2p_GO_confirm(struct adapter *padapter, u8 *raddr, u8 result)
{
- unsigned char category = RTW_WLAN_CATEGORY_PUBLIC;
+ unsigned char category = WLAN_CATEGORY_PUBLIC;
u8 action = P2P_PUB_ACTION_ACTION;
__be32 p2poui = cpu_to_be32(P2POUI);
u8 oui_subtype = P2P_GO_NEGO_CONF;
@@ -2404,7 +2404,7 @@ static void issue_p2p_GO_confirm(struct adapter *padapter, u8 *raddr, u8 result)
void issue_p2p_invitation_request(struct adapter *padapter, u8 *raddr)
{
- unsigned char category = RTW_WLAN_CATEGORY_PUBLIC;
+ unsigned char category = WLAN_CATEGORY_PUBLIC;
u8 action = P2P_PUB_ACTION_ACTION;
__be32 p2poui = cpu_to_be32(P2POUI);
u8 oui_subtype = P2P_INVIT_REQ;
@@ -2651,7 +2651,7 @@ void issue_p2p_invitation_request(struct adapter *padapter, u8 *raddr)
void issue_p2p_invitation_response(struct adapter *padapter, u8 *raddr, u8 dialogToken, u8 status_code)
{
- unsigned char category = RTW_WLAN_CATEGORY_PUBLIC;
+ unsigned char category = WLAN_CATEGORY_PUBLIC;
u8 action = P2P_PUB_ACTION_ACTION;
__be32 p2poui = cpu_to_be32(P2POUI);
u8 oui_subtype = P2P_INVIT_RESP;
@@ -2841,7 +2841,7 @@ void issue_p2p_invitation_response(struct adapter *padapter, u8 *raddr, u8 dialo
void issue_p2p_provision_request(struct adapter *padapter, u8 *pssid, u8 ussidlen, u8 *pdev_raddr)
{
- unsigned char category = RTW_WLAN_CATEGORY_PUBLIC;
+ unsigned char category = WLAN_CATEGORY_PUBLIC;
u8 action = P2P_PUB_ACTION_ACTION;
u8 dialogToken = 1;
u8 oui_subtype = P2P_PROVISION_DISC_REQ;
@@ -3812,7 +3812,7 @@ unsigned int on_action_public(struct adapter *padapter, struct recv_frame *precv
goto exit;
category = frame_body[0];
- if (category != RTW_WLAN_CATEGORY_PUBLIC)
+ if (category != WLAN_CATEGORY_PUBLIC)
goto exit;
action = frame_body[1];
@@ -3874,10 +3874,10 @@ unsigned int OnAction(struct adapter *padapter, struct recv_frame *precv_frame)
struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)precv_frame->rx_data;
switch (mgmt->u.action.category) {
- case RTW_WLAN_CATEGORY_BACK:
+ case WLAN_CATEGORY_BACK:
OnAction_back(padapter, precv_frame);
break;
- case RTW_WLAN_CATEGORY_PUBLIC:
+ case WLAN_CATEGORY_PUBLIC:
on_action_public(padapter, precv_frame);
break;
case RTW_WLAN_CATEGORY_P2P:
@@ -5370,7 +5370,7 @@ int issue_deauth_ex(struct adapter *padapter, u8 *da, unsigned short reason, int
void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned char action, unsigned short status)
{
- u8 category = RTW_WLAN_CATEGORY_BACK;
+ u8 category = WLAN_CATEGORY_BACK;
u16 start_seq;
u16 BA_para_set;
u16 reason_code;
@@ -5504,7 +5504,7 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter)
if (pmlmeinfo->bwmode_updated)
return;
- category = RTW_WLAN_CATEGORY_PUBLIC;
+ category = WLAN_CATEGORY_PUBLIC;
action = ACT_PUBLIC_BSSCOEXIST;
pmgntframe = alloc_mgtxmitframe(pxmitpriv);
diff --git a/drivers/staging/r8188eu/core/rtw_p2p.c b/drivers/staging/r8188eu/core/rtw_p2p.c
index fadacef44813..59bb1bd12d59 100644
--- a/drivers/staging/r8188eu/core/rtw_p2p.c
+++ b/drivers/staging/r8188eu/core/rtw_p2p.c
@@ -171,7 +171,7 @@ static void issue_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 s
struct adapter *padapter = pwdinfo->padapter;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
- unsigned char category = RTW_WLAN_CATEGORY_PUBLIC;
+ unsigned char category = WLAN_CATEGORY_PUBLIC;
u8 action = P2P_PUB_ACTION_ACTION;
__be32 p2poui = cpu_to_be32(P2POUI);
u8 oui_subtype = P2P_DEVDISC_RESP;
@@ -233,7 +233,7 @@ static void issue_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 s
static void issue_p2p_provision_resp(struct wifidirect_info *pwdinfo, u8 *raddr, u8 *frame_body, u16 config_method)
{
struct adapter *padapter = pwdinfo->padapter;
- unsigned char category = RTW_WLAN_CATEGORY_PUBLIC;
+ unsigned char category = WLAN_CATEGORY_PUBLIC;
u8 action = P2P_PUB_ACTION_ACTION;
u8 dialogToken = frame_body[7]; /* The Dialog Token of provisioning discovery request frame. */
__be32 p2poui = cpu_to_be32(P2POUI);
diff --git a/drivers/staging/r8188eu/include/ieee80211.h b/drivers/staging/r8188eu/include/ieee80211.h
index c593f9278868..4d3e89939114 100644
--- a/drivers/staging/r8188eu/include/ieee80211.h
+++ b/drivers/staging/r8188eu/include/ieee80211.h
@@ -596,8 +596,6 @@ static inline int is_broadcast_mac_addr(const u8 *addr)
/* Action category code */
enum rtw_ieee80211_category {
- RTW_WLAN_CATEGORY_BACK = 3,
- RTW_WLAN_CATEGORY_PUBLIC = 4, /* IEEE 802.11 public action frames */
RTW_WLAN_CATEGORY_P2P = 0x7f,/* P2P action frames */
};
--
2.30.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 9/9] staging: r8188eu: remove unused IEEE_* defines
2022-05-02 20:06 [PATCH 0/9] staging: r8188eu: clean up OnAction Martin Kaiser
` (7 preceding siblings ...)
2022-05-02 20:06 ` [PATCH 8/9] staging: r8188eu: use standard category defines Martin Kaiser
@ 2022-05-02 20:06 ` Martin Kaiser
8 siblings, 0 replies; 10+ messages in thread
From: Martin Kaiser @ 2022-05-02 20:06 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
linux-kernel, Martin Kaiser
The IEEE_* defines in the driver's ieee80211.h header file are not used.
Remove them.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/include/ieee80211.h | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/staging/r8188eu/include/ieee80211.h b/drivers/staging/r8188eu/include/ieee80211.h
index 4d3e89939114..15636a808f52 100644
--- a/drivers/staging/r8188eu/include/ieee80211.h
+++ b/drivers/staging/r8188eu/include/ieee80211.h
@@ -589,11 +589,6 @@ static inline int is_broadcast_mac_addr(const u8 *addr)
#define MAXTID 16
-#define IEEE_A (1<<0)
-#define IEEE_B (1<<1)
-#define IEEE_G (1<<2)
-#define IEEE_MODE_MASK (IEEE_A|IEEE_B|IEEE_G)
-
/* Action category code */
enum rtw_ieee80211_category {
RTW_WLAN_CATEGORY_P2P = 0x7f,/* P2P action frames */
--
2.30.2
^ permalink raw reply related [flat|nested] 10+ messages in thread