Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d049431 authored by Edgardo Hames's avatar Edgardo Hames Committed by Greg Kroah-Hartman
Browse files

Staging: wlan-ng: remove typedef in p80211hdr.h 



This patch removes the only typedef in p80211hdr.h.

Signed-off-by: default avatarEdgardo Hames <ehames@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b6bb56e6

drivers/staging/wlan-ng/cfg80211.c

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ int prism2_get_station(struct wiphy *wiphy, struct net_device *dev, 
	if (wlandev->mlmerequest == NULL)

		return -EOPNOTSUPP;



	result = wlandev->mlmerequest(wlandev, (p80211msg_t *) &quality);

	result = wlandev->mlmerequest(wlandev, (struct p80211msg *) &quality);





	if (result == 0) {

drivers/staging/wlan-ng/p80211msg.h

+2 −2
Original line number Diff line number Diff line
@@ -50,10 +50,10 @@ 


#define WLAN_DEVNAMELEN_MAX	16



typedef struct p80211msg {

struct p80211msg {

	u32 msgcode;

	u32 msglen;

	u8 devname[WLAN_DEVNAMELEN_MAX];

} __attribute__ ((packed)) p80211msg_t;

} __attribute__ ((packed));



#endif /* _P80211MSG_H */

drivers/staging/wlan-ng/p80211netdev.h

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ typedef struct wlandevice { 
	int (*txframe) (struct wlandevice *wlandev, struct sk_buff *skb,

			union p80211_hdr *p80211_hdr,

			struct p80211_metawep *p80211_wep);

	int (*mlmerequest) (struct wlandevice *wlandev, p80211msg_t *msg);

	int (*mlmerequest) (struct wlandevice *wlandev, struct p80211msg *msg);

	int (*set_multicast_list) (struct wlandevice *wlandev,

				   netdevice_t *dev);

	void (*tx_timeout) (struct wlandevice *wlandev);

drivers/staging/wlan-ng/p80211req.c

+3 −3
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ 
#include "p80211metastruct.h"

#include "p80211req.h"



static void p80211req_handlemsg(wlandevice_t *wlandev, p80211msg_t *msg);

static void p80211req_handlemsg(wlandevice_t *wlandev, struct p80211msg *msg);

static int p80211req_mibset_mibget(wlandevice_t *wlandev,

				   struct p80211msg_dot11req_mibget *mib_msg,

				   int isget);
@@ -96,7 +96,7 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev, 
int p80211req_dorequest(wlandevice_t *wlandev, u8 *msgbuf)

{

	int result = 0;

	p80211msg_t *msg = (p80211msg_t *) msgbuf;

	struct p80211msg *msg = (struct p80211msg *) msgbuf;



	/* Check to make sure the MSD is running */

	if (!((wlandev->msdstate == WLAN_MSD_HWPRESENT &&
@@ -150,7 +150,7 @@ int p80211req_dorequest(wlandevice_t *wlandev, u8 *msgbuf) 
* Call context:

*	Process thread

----------------------------------------------------------------*/

static void p80211req_handlemsg(wlandevice_t *wlandev, p80211msg_t *msg)

static void p80211req_handlemsg(wlandevice_t *wlandev, struct p80211msg *msg)

{

	switch (msg->msgcode) {

drivers/staging/wlan-ng/prism2fw.c

+4 −4
Original line number Diff line number Diff line
@@ -983,7 +983,7 @@ int writeimage(wlandevice_t *wlandev, struct imgchunk *fchunk, 
	int result = 0;

	struct p80211msg_p2req_ramdl_state rstatemsg;

	struct p80211msg_p2req_ramdl_write rwritemsg;

	p80211msg_t *msgp;

	struct p80211msg *msgp;

	u32 resultcode;

	int i;

	int j;
@@ -1029,7 +1029,7 @@ int writeimage(wlandevice_t *wlandev, struct imgchunk *fchunk, 
	rstatemsg.enable.data = P80211ENUM_truth_true;

	rstatemsg.exeaddr.data = startaddr;



	msgp = (p80211msg_t *) &rstatemsg;

	msgp = (struct p80211msg *) &rstatemsg;

	result = prism2mgmt_ramdl_state(wlandev, msgp);

	if (result) {

		printk(KERN_ERR
@@ -1070,7 +1070,7 @@ int writeimage(wlandevice_t *wlandev, struct imgchunk *fchunk, 
			    ("Sending xxxdl_write message addr=%06x len=%d.\n",

			     currdaddr, currlen);



			msgp = (p80211msg_t *) &rwritemsg;

			msgp = (struct p80211msg *) &rwritemsg;

			result = prism2mgmt_ramdl_write(wlandev, msgp);



			/* Check the results */
@@ -1097,7 +1097,7 @@ int writeimage(wlandevice_t *wlandev, struct imgchunk *fchunk, 
	rstatemsg.enable.data = P80211ENUM_truth_false;

	rstatemsg.exeaddr.data = 0;



	msgp = (p80211msg_t *) &rstatemsg;

	msgp = (struct p80211msg *) &rstatemsg;

	result = prism2mgmt_ramdl_state(wlandev, msgp);

	if (result) {

		printk(KERN_ERR