The patch set proposes to clean unused code from the wlan-ng driver. The patches
are compile tested on my x86 machine.
Change in v2:
1. Review and include additional code clean-up opportunities as
suggested by [email protected] and [email protected]
2. Combine changes for different impact areas into a path sea.
Suggested by [email protected]
Deepak R Varma (7):
staging: wlan-ng: Remove unused struct wlan_ie_ssid references
staging: wlan-ng: Remove unused struct wlan_ie_supp_rates references
staging: wlan-ng: Remove unused struct wlan_ie_tim references
staging: wlan-ng: Remove unused struct wlan_ie_ibss_parms references
staging: wlan-ng: Remove unused struct p80211macarray definition
staging: wlan-ng: Remove unused function declarations
staging: wlan-ng: Remove unused structure definitions
drivers/staging/wlan-ng/p80211mgmt.h | 301 --------------------------
drivers/staging/wlan-ng/p80211types.h | 6 -
2 files changed, 307 deletions(-)
--
2.34.1
Pointer reference to struct wlan_ie_tim is added as a member
variable of a structure; However, this references is never
used. Remove such unused struct reference. The cleanup also
renders the struct useless; so remove it as well.
Issue identified as part of coccicheck based code analysis.
Suggested-by: Dan Carpenter <[email protected]>
Suggested-by: Pavel Skripkin <[email protected]>
Signed-off-by: Deepak R Varma <[email protected]>
---
Changes in v2:
1. Include additional code clean-up opportunities and combine changes in a
patch set based on impact areas.
2. The patch changes are compile tested only on X86 arch.
drivers/staging/wlan-ng/p80211mgmt.h | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/drivers/staging/wlan-ng/p80211mgmt.h b/drivers/staging/wlan-ng/p80211mgmt.h
index 536794bdd1f0..d95ffe0097e9 100644
--- a/drivers/staging/wlan-ng/p80211mgmt.h
+++ b/drivers/staging/wlan-ng/p80211mgmt.h
@@ -253,16 +253,6 @@ struct wlan_ie_cf_parms {
u16 cfp_durremaining;
} __packed;
-/*-- TIM ------------------------------------------*/
-struct wlan_ie_tim {
- u8 eid;
- u8 len;
- u8 dtim_cnt;
- u8 dtim_period;
- u8 bitmap_ctl;
- u8 virt_bm[1];
-} __packed;
-
/*-- IBSS Parameter Set ---------------------------*/
struct wlan_ie_ibss_parms {
u8 eid;
@@ -309,8 +299,6 @@ struct wlan_fr_beacon {
struct wlan_ie_ds_parms *ds_parms;
struct wlan_ie_cf_parms *cf_parms;
struct wlan_ie_ibss_parms *ibss_parms;
- struct wlan_ie_tim *tim;
-
};
/*-- IBSS ATIM ------------------------------------*/
--
2.34.1
Pointer reference to struct wlan_ie_ssid is added as a member variable
to 5 different structures. However, these references are never used.
Remove such unused struct references. The cleanup also renders the
struct useless; so remove it as well.
Issue identified as part of coccicheck based code analysis.
Suggested-by: Dan Carpenter <[email protected]>
Suggested-by: Pavel Skripkin <[email protected]>
Signed-off-by: Deepak R Varma <[email protected]>
---
Changes in v2:
1. Include additional code clean-up opportunities and combine changes in a
patch set based on impact areas.
2. The patch changes are compile tested only on X86 arch.
drivers/staging/wlan-ng/p80211mgmt.h | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/drivers/staging/wlan-ng/p80211mgmt.h b/drivers/staging/wlan-ng/p80211mgmt.h
index 1ef30d3f3159..dcff56d18498 100644
--- a/drivers/staging/wlan-ng/p80211mgmt.h
+++ b/drivers/staging/wlan-ng/p80211mgmt.h
@@ -225,13 +225,6 @@ struct wlan_ie {
u8 len;
} __packed;
-/*-- Service Set Identity (SSID) -----------------*/
-struct wlan_ie_ssid {
- u8 eid;
- u8 len;
- u8 ssid[1]; /* may be zero, ptrs may overlap */
-} __packed;
-
/*-- Supported Rates -----------------------------*/
struct wlan_ie_supp_rates {
u8 eid;
@@ -319,7 +312,6 @@ struct wlan_fr_beacon {
u16 *bcn_int;
u16 *cap_info;
/*-- info elements ----------*/
- struct wlan_ie_ssid *ssid;
struct wlan_ie_supp_rates *supp_rates;
struct wlan_ie_fh_parms *fh_parms;
struct wlan_ie_ds_parms *ds_parms;
@@ -372,7 +364,6 @@ struct wlan_fr_assocreq {
u16 *cap_info;
u16 *listen_int;
/*-- info elements ----------*/
- struct wlan_ie_ssid *ssid;
struct wlan_ie_supp_rates *supp_rates;
};
@@ -407,7 +398,6 @@ struct wlan_fr_reassocreq {
u16 *listen_int;
u8 *curr_ap;
/*-- info elements ----------*/
- struct wlan_ie_ssid *ssid;
struct wlan_ie_supp_rates *supp_rates;
};
@@ -439,7 +429,6 @@ struct wlan_fr_probereq {
void *priv;
/*-- fixed fields -----------*/
/*-- info elements ----------*/
- struct wlan_ie_ssid *ssid;
struct wlan_ie_supp_rates *supp_rates;
};
@@ -457,7 +446,6 @@ struct wlan_fr_proberesp {
u16 *bcn_int;
u16 *cap_info;
/*-- info elements ----------*/
- struct wlan_ie_ssid *ssid;
struct wlan_ie_supp_rates *supp_rates;
struct wlan_ie_fh_parms *fh_parms;
struct wlan_ie_ds_parms *ds_parms;
--
2.34.1
Pointer reference to struct wlan_ie_supp_rates is added as a member
variable to 7 different structures. However, these references are
never used. Remove such unused struct references. The cleanup also
renders the struct useless; so remove it as well.
Issue identified as part of coccicheck based code analysis.
Suggested-by: Dan Carpenter <[email protected]>
Suggested-by: Pavel Skripkin <[email protected]>
Signed-off-by: Deepak R Varma <[email protected]>
---
Changes in v2:
1. Include additional code clean-up opportunities and combine changes in a
patch set based on impact areas.
2. The patch changes are compile tested only on X86 arch.
drivers/staging/wlan-ng/p80211mgmt.h | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/drivers/staging/wlan-ng/p80211mgmt.h b/drivers/staging/wlan-ng/p80211mgmt.h
index dcff56d18498..536794bdd1f0 100644
--- a/drivers/staging/wlan-ng/p80211mgmt.h
+++ b/drivers/staging/wlan-ng/p80211mgmt.h
@@ -225,13 +225,6 @@ struct wlan_ie {
u8 len;
} __packed;
-/*-- Supported Rates -----------------------------*/
-struct wlan_ie_supp_rates {
- u8 eid;
- u8 len;
- u8 rates[1]; /* had better be at LEAST one! */
-} __packed;
-
/*-- FH Parameter Set ----------------------------*/
struct wlan_ie_fh_parms {
u8 eid;
@@ -312,7 +305,6 @@ struct wlan_fr_beacon {
u16 *bcn_int;
u16 *cap_info;
/*-- info elements ----------*/
- struct wlan_ie_supp_rates *supp_rates;
struct wlan_ie_fh_parms *fh_parms;
struct wlan_ie_ds_parms *ds_parms;
struct wlan_ie_cf_parms *cf_parms;
@@ -364,7 +356,6 @@ struct wlan_fr_assocreq {
u16 *cap_info;
u16 *listen_int;
/*-- info elements ----------*/
- struct wlan_ie_supp_rates *supp_rates;
};
@@ -381,7 +372,6 @@ struct wlan_fr_assocresp {
u16 *status;
u16 *aid;
/*-- info elements ----------*/
- struct wlan_ie_supp_rates *supp_rates;
};
@@ -398,7 +388,6 @@ struct wlan_fr_reassocreq {
u16 *listen_int;
u8 *curr_ap;
/*-- info elements ----------*/
- struct wlan_ie_supp_rates *supp_rates;
};
@@ -415,7 +404,6 @@ struct wlan_fr_reassocresp {
u16 *status;
u16 *aid;
/*-- info elements ----------*/
- struct wlan_ie_supp_rates *supp_rates;
};
@@ -429,7 +417,6 @@ struct wlan_fr_probereq {
void *priv;
/*-- fixed fields -----------*/
/*-- info elements ----------*/
- struct wlan_ie_supp_rates *supp_rates;
};
@@ -446,7 +433,6 @@ struct wlan_fr_proberesp {
u16 *bcn_int;
u16 *cap_info;
/*-- info elements ----------*/
- struct wlan_ie_supp_rates *supp_rates;
struct wlan_ie_fh_parms *fh_parms;
struct wlan_ie_ds_parms *ds_parms;
struct wlan_ie_cf_parms *cf_parms;
--
2.34.1
Pointer reference to struct wlan_ie_ibss_parms is added as a member
variable to 2 structures; However, these references are never used.
Remove such unused struct references. The cleanup also renders the
struct useless; so remove it as well.
Issue identified as part of coccicheck based code analysis.
Suggested-by: Dan Carpenter <[email protected]>
Suggested-by: Pavel Skripkin <[email protected]>
Signed-off-by: Deepak R Varma <[email protected]>
---
Changes in v2:
1. Include additional code clean-up opportunities and combine changes in a
patch set based on impact areas.
2. The patch changes are compile tested only on X86 arch.
drivers/staging/wlan-ng/p80211mgmt.h | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/drivers/staging/wlan-ng/p80211mgmt.h b/drivers/staging/wlan-ng/p80211mgmt.h
index d95ffe0097e9..816b25641f5a 100644
--- a/drivers/staging/wlan-ng/p80211mgmt.h
+++ b/drivers/staging/wlan-ng/p80211mgmt.h
@@ -253,13 +253,6 @@ struct wlan_ie_cf_parms {
u16 cfp_durremaining;
} __packed;
-/*-- IBSS Parameter Set ---------------------------*/
-struct wlan_ie_ibss_parms {
- u8 eid;
- u8 len;
- u16 atim_win;
-} __packed;
-
/*-- Challenge Text ------------------------------*/
struct wlan_ie_challenge {
u8 eid;
@@ -298,7 +291,6 @@ struct wlan_fr_beacon {
struct wlan_ie_fh_parms *fh_parms;
struct wlan_ie_ds_parms *ds_parms;
struct wlan_ie_cf_parms *cf_parms;
- struct wlan_ie_ibss_parms *ibss_parms;
};
/*-- IBSS ATIM ------------------------------------*/
@@ -424,7 +416,6 @@ struct wlan_fr_proberesp {
struct wlan_ie_fh_parms *fh_parms;
struct wlan_ie_ds_parms *ds_parms;
struct wlan_ie_cf_parms *cf_parms;
- struct wlan_ie_ibss_parms *ibss_parms;
};
/*-- Authentication -------------------------------*/
--
2.34.1
Remove structure definitions that are never used in the code.
Signed-off-by: Deepak R Varma <[email protected]>
---
Changes in v2:
1. Patch included in patch set.
2. The patch changes are compile tested only on X86 arch.
drivers/staging/wlan-ng/p80211mgmt.h | 232 ---------------------------
1 file changed, 232 deletions(-)
diff --git a/drivers/staging/wlan-ng/p80211mgmt.h b/drivers/staging/wlan-ng/p80211mgmt.h
index da824bc36365..fc23fae5651b 100644
--- a/drivers/staging/wlan-ng/p80211mgmt.h
+++ b/drivers/staging/wlan-ng/p80211mgmt.h
@@ -217,236 +217,4 @@
#define WLAN_SET_MGMT_CAP_INFO_PBCC(n) ((n) << 6)
#define WLAN_SET_MGMT_CAP_INFO_AGILITY(n) ((n) << 7)
-/*-- Information Element Types --------------------*/
-/* prototype structure, all IEs start with these members */
-
-struct wlan_ie {
- u8 eid;
- u8 len;
-} __packed;
-
-/*-- FH Parameter Set ----------------------------*/
-struct wlan_ie_fh_parms {
- u8 eid;
- u8 len;
- u16 dwell;
- u8 hopset;
- u8 hoppattern;
- u8 hopindex;
-} __packed;
-
-/*-- DS Parameter Set ----------------------------*/
-struct wlan_ie_ds_parms {
- u8 eid;
- u8 len;
- u8 curr_ch;
-} __packed;
-
-/*-- CF Parameter Set ----------------------------*/
-
-struct wlan_ie_cf_parms {
- u8 eid;
- u8 len;
- u8 cfp_cnt;
- u8 cfp_period;
- u16 cfp_maxdur;
- u16 cfp_durremaining;
-} __packed;
-
-/*-- Challenge Text ------------------------------*/
-struct wlan_ie_challenge {
- u8 eid;
- u8 len;
- u8 challenge[1];
-} __packed;
-
-/*-------------------------------------------------*/
-/* Frame Types */
-
-/* prototype structure, all mgmt frame types will start with these members */
-struct wlan_fr_mgmt {
- u16 type;
- u16 len; /* DOES NOT include CRC !!!! */
- u8 *buf;
- struct p80211_hdr *hdr;
- /* used for target specific data, skb in Linux */
- void *priv;
- /*-- fixed fields -----------*/
- /*-- info elements ----------*/
-};
-
-/*-- Beacon ---------------------------------------*/
-struct wlan_fr_beacon {
- u16 type;
- u16 len;
- u8 *buf;
- struct p80211_hdr *hdr;
- /* used for target specific data, skb in Linux */
- void *priv;
- /*-- fixed fields -----------*/
- u64 *ts;
- u16 *bcn_int;
- u16 *cap_info;
- /*-- info elements ----------*/
- struct wlan_ie_fh_parms *fh_parms;
- struct wlan_ie_ds_parms *ds_parms;
- struct wlan_ie_cf_parms *cf_parms;
-};
-
-/*-- IBSS ATIM ------------------------------------*/
-struct wlan_fr_ibssatim {
- u16 type;
- u16 len;
- u8 *buf;
- struct p80211_hdr *hdr;
- /* used for target specific data, skb in Linux */
- void *priv;
-
- /*-- fixed fields -----------*/
- /*-- info elements ----------*/
-
- /* this frame type has a null body */
-
-};
-
-/*-- Disassociation -------------------------------*/
-struct wlan_fr_disassoc {
- u16 type;
- u16 len;
- u8 *buf;
- struct p80211_hdr *hdr;
- /* used for target specific data, skb in Linux */
- void *priv;
- /*-- fixed fields -----------*/
- u16 *reason;
-
- /*-- info elements ----------*/
-
-};
-
-/*-- Association Request --------------------------*/
-struct wlan_fr_assocreq {
- u16 type;
- u16 len;
- u8 *buf;
- struct p80211_hdr *hdr;
- /* used for target specific data, skb in Linux */
- void *priv;
- /*-- fixed fields -----------*/
- u16 *cap_info;
- u16 *listen_int;
- /*-- info elements ----------*/
-
-};
-
-/*-- Association Response -------------------------*/
-struct wlan_fr_assocresp {
- u16 type;
- u16 len;
- u8 *buf;
- struct p80211_hdr *hdr;
- /* used for target specific data, skb in Linux */
- void *priv;
- /*-- fixed fields -----------*/
- u16 *cap_info;
- u16 *status;
- u16 *aid;
- /*-- info elements ----------*/
-
-};
-
-/*-- Reassociation Request ------------------------*/
-struct wlan_fr_reassocreq {
- u16 type;
- u16 len;
- u8 *buf;
- struct p80211_hdr *hdr;
- /* used for target specific data, skb in Linux */
- void *priv;
- /*-- fixed fields -----------*/
- u16 *cap_info;
- u16 *listen_int;
- u8 *curr_ap;
- /*-- info elements ----------*/
-
-};
-
-/*-- Reassociation Response -----------------------*/
-struct wlan_fr_reassocresp {
- u16 type;
- u16 len;
- u8 *buf;
- struct p80211_hdr *hdr;
- /* used for target specific data, skb in Linux */
- void *priv;
- /*-- fixed fields -----------*/
- u16 *cap_info;
- u16 *status;
- u16 *aid;
- /*-- info elements ----------*/
-
-};
-
-/*-- Probe Request --------------------------------*/
-struct wlan_fr_probereq {
- u16 type;
- u16 len;
- u8 *buf;
- struct p80211_hdr *hdr;
- /* used for target specific data, skb in Linux */
- void *priv;
- /*-- fixed fields -----------*/
- /*-- info elements ----------*/
-
-};
-
-/*-- Probe Response -------------------------------*/
-struct wlan_fr_proberesp {
- u16 type;
- u16 len;
- u8 *buf;
- struct p80211_hdr *hdr;
- /* used for target specific data, skb in Linux */
- void *priv;
- /*-- fixed fields -----------*/
- u64 *ts;
- u16 *bcn_int;
- u16 *cap_info;
- /*-- info elements ----------*/
- struct wlan_ie_fh_parms *fh_parms;
- struct wlan_ie_ds_parms *ds_parms;
- struct wlan_ie_cf_parms *cf_parms;
-};
-
-/*-- Authentication -------------------------------*/
-struct wlan_fr_authen {
- u16 type;
- u16 len;
- u8 *buf;
- struct p80211_hdr *hdr;
- /* used for target specific data, skb in Linux */
- void *priv;
- /*-- fixed fields -----------*/
- u16 *auth_alg;
- u16 *auth_seq;
- u16 *status;
- /*-- info elements ----------*/
- struct wlan_ie_challenge *challenge;
-
-};
-
-/*-- Deauthenication -----------------------------*/
-struct wlan_fr_deauthen {
- u16 type;
- u16 len;
- u8 *buf;
- struct p80211_hdr *hdr;
- /* used for target specific data, skb in Linux */
- void *priv;
- /*-- fixed fields -----------*/
- u16 *reason;
-
- /*-- info elements ----------*/
-
-};
#endif /* _P80211MGMT_H */
--
2.34.1
struct p80211macarray is defined but is never used. Remove the unused
struct declaration.
Issue identified as part of coccicheck based code analysis.
Suggested-by: Dan Carpenter <[email protected]>
Suggested-by: Pavel Skripkin <[email protected]>
Signed-off-by: Deepak R Varma <[email protected]>
---
Changes in v2:
1. Include additional code clean-up opportunities and combine changes in a
patch set based on impact areas.
2. The patch changes are compile tested only on X86 arch.
drivers/staging/wlan-ng/p80211types.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/staging/wlan-ng/p80211types.h b/drivers/staging/wlan-ng/p80211types.h
index 6486612a8f31..b2ed96960413 100644
--- a/drivers/staging/wlan-ng/p80211types.h
+++ b/drivers/staging/wlan-ng/p80211types.h
@@ -231,12 +231,6 @@ struct p80211pstr32 {
u8 data[MAXLEN_PSTR32];
} __packed;
-/* MAC address array */
-struct p80211macarray {
- u32 cnt;
- u8 data[1][MAXLEN_PSTR6];
-} __packed;
-
/* prototype template */
struct p80211item {
u32 did;
--
2.34.1