Skip to contentSkip to conversation

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

PATCH In review Edgardo Hames 2 participants 2 messages Jul 31, 2010 – Aug 3, 2010 Staging

lore
Share & tools
lore

Edgardo Hames

author
#0 lore raw

PATCH 1/1 Staging: wlan-ng: remove typedef in p80211ioctl.h

This patches removes the only typedef in p80211ioctl.h

Signed-off-by Edgardo Hames <[email protected]>
---
 drivers/staging/wlan-ng/p80211ioctl.h  |    4 ++--
 drivers/staging/wlan-ng/p80211netdev.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/wlan-ng/p80211ioctl.h +2 -2
index 64ca7f9..0d47765 100644
@@ -78,12 +78,12 @@
 /*  argument to the ioctl system call when issuing a request to */
 /*  the p80211 module. */
 
-typedef struct p80211ioctl_req {
+struct p80211ioctl_req {
 	char name[WLAN_DEVNAMELEN_MAX];
 	caddr_t data;
 	u32 magic;
 	u16 len;
 	u32 result;
-} __attribute__ ((packed)) p80211ioctl_req_t;
+} __attribute__ ((packed));
 
 #endif /* _P80211IOCTL_H */
drivers/staging/wlan-ng/p80211netdev.c +1 -1
index 5b68af0..a57ac52 100644
@@ -560,7 +560,7 @@ static int p80211netdev_ethtool(wlandevice_t *wlandev, void __user *useraddr)
 static int p80211knetdev_do_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd)
 {
 	int result = 0;
-	p80211ioctl_req_t *req = (p80211ioctl_req_t *) ifr;
+	struct p80211ioctl_req *req = (struct p80211ioctl_req *) ifr;
 	wlandevice_t *wlandev = dev->ml_priv;
 	u8 *msgbuf;
Signature · 1 line
1.7.0.4
#1 lore raw

drivers/staging/wlan-ng/p80211ioctl.h line 87

Quoted 10 lines · Edgardo Hames
drivers/staging/wlan-ng/p80211ioctl.h +2 -2
-typedef struct p80211ioctl_req {
+struct p80211ioctl_req {
        char name[WLAN_DEVNAMELEN_MAX];
        caddr_t data;
        u32 magic;
        u16 len;
        u32 result;
-} __attribute__ ((packed)) p80211ioctl_req_t;
+} __attribute__ ((packed));

BTW, this data structure is broken and needs fixing. Putting a pointer in there means that it's incompatible between 32 and 64 bit user space, among other problems.

The TODO list for this driver already contains "move to use the in-kernel wireless stack", which should consequently imply getting rid of this p80211knetdev_do_ioctl function, but it may be useful to list that as a separate item.

Arnd