aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Paracuellos <sergio.paracuellos@gmail.com>2016-09-25 09:34:59 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-25 13:53:06 -0400
commitac033ec9f71a7107b64390fd9b52f799a22acedf (patch)
tree0f71d85458610cb59e081ee9af873392394fe488
parentcf796937323dba7622409801a96fa09741523505 (diff)
staging: wlan-ng: avoid new typedef: p80211itemd_t
This patch fixes the following checkpatch.pl warning in p80211types.h: WARNING: do not add new typedefs It applies for typedef p80211itemd_t Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/wlan-ng/p80211req.c2
-rw-r--r--drivers/staging/wlan-ng/p80211types.h4
-rw-r--r--drivers/staging/wlan-ng/prism2fw.c4
-rw-r--r--drivers/staging/wlan-ng/prism2mib.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/wlan-ng/p80211req.c b/drivers/staging/wlan-ng/p80211req.c
index 61962d72bdd6..d43e85b5d49b 100644
--- a/drivers/staging/wlan-ng/p80211req.c
+++ b/drivers/staging/wlan-ng/p80211req.c
@@ -195,7 +195,7 @@ static void p80211req_mibset_mibget(struct wlandevice *wlandev,
195 struct p80211msg_dot11req_mibget *mib_msg, 195 struct p80211msg_dot11req_mibget *mib_msg,
196 int isget) 196 int isget)
197{ 197{
198 p80211itemd_t *mibitem = (p80211itemd_t *)mib_msg->mibattribute.data; 198 struct p80211itemd *mibitem = (struct p80211itemd *)mib_msg->mibattribute.data;
199 struct p80211pstrd *pstr = (struct p80211pstrd *)mibitem->data; 199 struct p80211pstrd *pstr = (struct p80211pstrd *)mibitem->data;
200 u8 *key = mibitem->data + sizeof(struct p80211pstrd); 200 u8 *key = mibitem->data + sizeof(struct p80211pstrd);
201 201
diff --git a/drivers/staging/wlan-ng/p80211types.h b/drivers/staging/wlan-ng/p80211types.h
index 65400445543d..57a65a83e3b5 100644
--- a/drivers/staging/wlan-ng/p80211types.h
+++ b/drivers/staging/wlan-ng/p80211types.h
@@ -262,12 +262,12 @@ struct p80211item {
262} __packed; 262} __packed;
263 263
264/* prototype template w/ data item */ 264/* prototype template w/ data item */
265typedef struct p80211itemd { 265struct p80211itemd {
266 u32 did; 266 u32 did;
267 u16 status; 267 u16 status;
268 u16 len; 268 u16 len;
269 u8 data[0]; 269 u8 data[0];
270} __packed p80211itemd_t; 270} __packed;
271 271
272/* message data item for int, BOUNDEDINT, ENUMINT */ 272/* message data item for int, BOUNDEDINT, ENUMINT */
273typedef struct p80211item_uint32 { 273typedef struct p80211item_uint32 {
diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c
index 870bad92d9b6..7c5d3e713681 100644
--- a/drivers/staging/wlan-ng/prism2fw.c
+++ b/drivers/staging/wlan-ng/prism2fw.c
@@ -243,7 +243,7 @@ static int prism2_fwapply(const struct ihex_binrec *rfptr,
243{ 243{
244 signed int result = 0; 244 signed int result = 0;
245 struct p80211msg_dot11req_mibget getmsg; 245 struct p80211msg_dot11req_mibget getmsg;
246 p80211itemd_t *item; 246 struct p80211itemd *item;
247 u32 *data; 247 u32 *data;
248 248
249 /* Initialize the data structures */ 249 /* Initialize the data structures */
@@ -293,7 +293,7 @@ static int prism2_fwapply(const struct ihex_binrec *rfptr,
293 getmsg.resultcode.did = DIDmsg_dot11req_mibget_resultcode; 293 getmsg.resultcode.did = DIDmsg_dot11req_mibget_resultcode;
294 getmsg.resultcode.status = P80211ENUM_msgitem_status_no_value; 294 getmsg.resultcode.status = P80211ENUM_msgitem_status_no_value;
295 295
296 item = (p80211itemd_t *)getmsg.mibattribute.data; 296 item = (struct p80211itemd *)getmsg.mibattribute.data;
297 item->did = DIDmib_p2_p2NIC_p2PRISupRange; 297 item->did = DIDmib_p2_p2NIC_p2PRISupRange;
298 item->status = P80211ENUM_msgitem_status_no_value; 298 item->status = P80211ENUM_msgitem_status_no_value;
299 299
diff --git a/drivers/staging/wlan-ng/prism2mib.c b/drivers/staging/wlan-ng/prism2mib.c
index e022de440bd2..3442de374deb 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -266,7 +266,7 @@ int prism2mgmt_mibset_mibget(struct wlandevice *wlandev, void *msgp)
266 u16 which; 266 u16 which;
267 267
268 struct p80211msg_dot11req_mibset *msg = msgp; 268 struct p80211msg_dot11req_mibset *msg = msgp;
269 p80211itemd_t *mibitem; 269 struct p80211itemd *mibitem;
270 270
271 msg->resultcode.status = P80211ENUM_msgitem_status_data_ok; 271 msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
272 msg->resultcode.data = P80211ENUM_resultcode_success; 272 msg->resultcode.data = P80211ENUM_resultcode_success;
@@ -284,7 +284,7 @@ int prism2mgmt_mibset_mibget(struct wlandevice *wlandev, void *msgp)
284 ** MIB table. 284 ** MIB table.
285 */ 285 */
286 286
287 mibitem = (p80211itemd_t *)msg->mibattribute.data; 287 mibitem = (struct p80211itemd *)msg->mibattribute.data;
288 288
289 for (mib = mibtab; mib->did != 0; mib++) 289 for (mib = mibtab; mib->did != 0; mib++)
290 if (mib->did == mibitem->did && (mib->flag & which)) 290 if (mib->did == mibitem->did && (mib->flag & which))