Skip to content

L
linux
Commit b26b2325 authored by Sergio Paracuellos's avatar Sergio Paracuellos Committed by Greg Kroah-Hartman
Browse files
Options

staging: wlan-ng: avoid new typedef: p80211item_uint32_t 

This patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs

It applies for typedef p80211item_uint32_t
Signed-off-by: default avatarSergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ac033ec9
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 120 deletions
drivers/staging/wlan-ng/cfg80211.c
View file @ b26b2325
......@@ -72,8 +72,8 @@ static int prism2_result2err(int prism2_result)
static int prism2_domibset_uint32(struct wlandevice *wlandev, u32 did, u32 data)
{
struct p80211msg_dot11req_mibset msg;
p80211item_uint32_t *mibitem =
(p80211item_uint32_t *)&msg.mibattribute.data;
struct p80211item_uint32 *mibitem =
(struct p80211item_uint32 *)&msg.mibattribute.data;
msg.msgcode = DIDmsg_dot11req_mibset;
mibitem->did = did;
......@@ -626,11 +626,11 @@ static int prism2_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,
struct prism2_wiphy_private *priv = wiphy_priv(wiphy);
struct wlandevice *wlandev = priv->wlandev;
struct p80211msg_dot11req_mibget msg;
p80211item_uint32_t *mibitem;
struct p80211item_uint32 *mibitem;
int result;
int err = 0;
mibitem = (p80211item_uint32_t *)&msg.mibattribute.data;
mibitem = (struct p80211item_uint32 *)&msg.mibattribute.data;
msg.msgcode = DIDmsg_dot11req_mibget;
mibitem->did =
DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel;
......
drivers/staging/wlan-ng/p80211metastruct.h
View file @ b26b2325
......@@ -52,7 +52,7 @@ struct p80211msg_dot11req_mibget {
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
p80211item_unk392_t mibattribute;
p80211item_uint32_t resultcode;
struct p80211item_uint32 resultcode;
} __packed;
struct p80211msg_dot11req_mibset {
......@@ -60,76 +60,76 @@ struct p80211msg_dot11req_mibset {
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
p80211item_unk392_t mibattribute;
p80211item_uint32_t resultcode;
struct p80211item_uint32 resultcode;
} __packed;
struct p80211msg_dot11req_scan {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
p80211item_uint32_t bsstype;
struct p80211item_uint32 bsstype;
p80211item_pstr6_t bssid;
u8 pad_0C[1];
p80211item_pstr32_t ssid;
u8 pad_1D[3];
p80211item_uint32_t scantype;
p80211item_uint32_t probedelay;
struct p80211item_uint32 scantype;
struct p80211item_uint32 probedelay;
p80211item_pstr14_t channellist;
u8 pad_2C[1];
p80211item_uint32_t minchanneltime;
p80211item_uint32_t maxchanneltime;
p80211item_uint32_t resultcode;
p80211item_uint32_t numbss;
p80211item_uint32_t append;
struct p80211item_uint32 minchanneltime;
struct p80211item_uint32 maxchanneltime;
struct p80211item_uint32 resultcode;
struct p80211item_uint32 numbss;
struct p80211item_uint32 append;
} __packed;
struct p80211msg_dot11req_scan_results {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
p80211item_uint32_t bssindex;
p80211item_uint32_t resultcode;
p80211item_uint32_t signal;
p80211item_uint32_t noise;
struct p80211item_uint32 bssindex;
struct p80211item_uint32 resultcode;
struct p80211item_uint32 signal;
struct p80211item_uint32 noise;
p80211item_pstr6_t bssid;
u8 pad_3C[1];
p80211item_pstr32_t ssid;
u8 pad_4D[3];
p80211item_uint32_t bsstype;
p80211item_uint32_t beaconperiod;
p80211item_uint32_t dtimperiod;
p80211item_uint32_t timestamp;
p80211item_uint32_t localtime;
p80211item_uint32_t fhdwelltime;
p80211item_uint32_t fhhopset;
p80211item_uint32_t fhhoppattern;
p80211item_uint32_t fhhopindex;
p80211item_uint32_t dschannel;
p80211item_uint32_t cfpcount;
p80211item_uint32_t cfpperiod;
p80211item_uint32_t cfpmaxduration;
p80211item_uint32_t cfpdurremaining;
p80211item_uint32_t ibssatimwindow;
p80211item_uint32_t cfpollable;
p80211item_uint32_t cfpollreq;
p80211item_uint32_t privacy;
p80211item_uint32_t capinfo;
p80211item_uint32_t basicrate1;
p80211item_uint32_t basicrate2;
p80211item_uint32_t basicrate3;
p80211item_uint32_t basicrate4;
p80211item_uint32_t basicrate5;
p80211item_uint32_t basicrate6;
p80211item_uint32_t basicrate7;
p80211item_uint32_t basicrate8;
p80211item_uint32_t supprate1;
p80211item_uint32_t supprate2;
p80211item_uint32_t supprate3;
p80211item_uint32_t supprate4;
p80211item_uint32_t supprate5;
p80211item_uint32_t supprate6;
p80211item_uint32_t supprate7;
p80211item_uint32_t supprate8;
struct p80211item_uint32 bsstype;
struct p80211item_uint32 beaconperiod;
struct p80211item_uint32 dtimperiod;
struct p80211item_uint32 timestamp;
struct p80211item_uint32 localtime;
struct p80211item_uint32 fhdwelltime;
struct p80211item_uint32 fhhopset;
struct p80211item_uint32 fhhoppattern;
struct p80211item_uint32 fhhopindex;
struct p80211item_uint32 dschannel;
struct p80211item_uint32 cfpcount;
struct p80211item_uint32 cfpperiod;
struct p80211item_uint32 cfpmaxduration;
struct p80211item_uint32 cfpdurremaining;
struct p80211item_uint32 ibssatimwindow;
struct p80211item_uint32 cfpollable;
struct p80211item_uint32 cfpollreq;
struct p80211item_uint32 privacy;
struct p80211item_uint32 capinfo;
struct p80211item_uint32 basicrate1;
struct p80211item_uint32 basicrate2;
struct p80211item_uint32 basicrate3;
struct p80211item_uint32 basicrate4;
struct p80211item_uint32 basicrate5;
struct p80211item_uint32 basicrate6;
struct p80211item_uint32 basicrate7;
struct p80211item_uint32 basicrate8;
struct p80211item_uint32 supprate1;
struct p80211item_uint32 supprate2;
struct p80211item_uint32 supprate3;
struct p80211item_uint32 supprate4;
struct p80211item_uint32 supprate5;
struct p80211item_uint32 supprate6;
struct p80211item_uint32 supprate7;
struct p80211item_uint32 supprate8;
} __packed;
struct p80211msg_dot11req_start {
......@@ -138,79 +138,79 @@ struct p80211msg_dot11req_start {
u8 devname[WLAN_DEVNAMELEN_MAX];
p80211item_pstr32_t ssid;
u8 pad_12D[3];
p80211item_uint32_t bsstype;
p80211item_uint32_t beaconperiod;
p80211item_uint32_t dtimperiod;
p80211item_uint32_t cfpperiod;
p80211item_uint32_t cfpmaxduration;
p80211item_uint32_t fhdwelltime;
p80211item_uint32_t fhhopset;
p80211item_uint32_t fhhoppattern;
p80211item_uint32_t dschannel;
p80211item_uint32_t ibssatimwindow;
p80211item_uint32_t probedelay;
p80211item_uint32_t cfpollable;
p80211item_uint32_t cfpollreq;
p80211item_uint32_t basicrate1;
p80211item_uint32_t basicrate2;
p80211item_uint32_t basicrate3;
p80211item_uint32_t basicrate4;
p80211item_uint32_t basicrate5;
p80211item_uint32_t basicrate6;
p80211item_uint32_t basicrate7;
p80211item_uint32_t basicrate8;
p80211item_uint32_t operationalrate1;
p80211item_uint32_t operationalrate2;
p80211item_uint32_t operationalrate3;
p80211item_uint32_t operationalrate4;
p80211item_uint32_t operationalrate5;
p80211item_uint32_t operationalrate6;
p80211item_uint32_t operationalrate7;
p80211item_uint32_t operationalrate8;
p80211item_uint32_t resultcode;
struct p80211item_uint32 bsstype;
struct p80211item_uint32 beaconperiod;
struct p80211item_uint32 dtimperiod;
struct p80211item_uint32 cfpperiod;
struct p80211item_uint32 cfpmaxduration;
struct p80211item_uint32 fhdwelltime;
struct p80211item_uint32 fhhopset;
struct p80211item_uint32 fhhoppattern;
struct p80211item_uint32 dschannel;
struct p80211item_uint32 ibssatimwindow;
struct p80211item_uint32 probedelay;
struct p80211item_uint32 cfpollable;
struct p80211item_uint32 cfpollreq;
struct p80211item_uint32 basicrate1;
struct p80211item_uint32 basicrate2;
struct p80211item_uint32 basicrate3;
struct p80211item_uint32 basicrate4;
struct p80211item_uint32 basicrate5;
struct p80211item_uint32 basicrate6;
struct p80211item_uint32 basicrate7;
struct p80211item_uint32 basicrate8;
struct p80211item_uint32 operationalrate1;
struct p80211item_uint32 operationalrate2;
struct p80211item_uint32 operationalrate3;
struct p80211item_uint32 operationalrate4;
struct p80211item_uint32 operationalrate5;
struct p80211item_uint32 operationalrate6;
struct p80211item_uint32 operationalrate7;
struct p80211item_uint32 operationalrate8;
struct p80211item_uint32 resultcode;
} __packed;
struct p80211msg_lnxreq_ifstate {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
p80211item_uint32_t ifstate;
p80211item_uint32_t resultcode;
struct p80211item_uint32 ifstate;
struct p80211item_uint32 resultcode;
} __packed;
struct p80211msg_lnxreq_wlansniff {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
p80211item_uint32_t enable;
p80211item_uint32_t channel;
p80211item_uint32_t prismheader;
p80211item_uint32_t wlanheader;
p80211item_uint32_t keepwepflags;
p80211item_uint32_t stripfcs;
p80211item_uint32_t packet_trunc;
p80211item_uint32_t resultcode;
struct p80211item_uint32 enable;
struct p80211item_uint32 channel;
struct p80211item_uint32 prismheader;
struct p80211item_uint32 wlanheader;
struct p80211item_uint32 keepwepflags;
struct p80211item_uint32 stripfcs;
struct p80211item_uint32 packet_trunc;
struct p80211item_uint32 resultcode;
} __packed;
struct p80211msg_lnxreq_hostwep {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
p80211item_uint32_t resultcode;
p80211item_uint32_t decrypt;
p80211item_uint32_t encrypt;
struct p80211item_uint32 resultcode;
struct p80211item_uint32 decrypt;
struct p80211item_uint32 encrypt;
} __packed;
struct p80211msg_lnxreq_commsquality {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
p80211item_uint32_t resultcode;
p80211item_uint32_t dbm;
p80211item_uint32_t link;
p80211item_uint32_t level;
p80211item_uint32_t noise;
p80211item_uint32_t txrate;
struct p80211item_uint32 resultcode;
struct p80211item_uint32 dbm;
struct p80211item_uint32 link;
struct p80211item_uint32 level;
struct p80211item_uint32 noise;
struct p80211item_uint32 txrate;
} __packed;
struct p80211msg_lnxreq_autojoin {
......@@ -219,8 +219,8 @@ struct p80211msg_lnxreq_autojoin {
u8 devname[WLAN_DEVNAMELEN_MAX];
p80211item_pstr32_t ssid;
u8 pad_19D[3];
p80211item_uint32_t authtype;
p80211item_uint32_t resultcode;
struct p80211item_uint32 authtype;
struct p80211item_uint32 resultcode;
} __packed;
struct p80211msg_p2req_readpda {
......@@ -228,44 +228,44 @@ struct p80211msg_p2req_readpda {
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
p80211item_unk1024_t pda;
p80211item_uint32_t resultcode;
struct p80211item_uint32 resultcode;
} __packed;
struct p80211msg_p2req_ramdl_state {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
p80211item_uint32_t enable;
p80211item_uint32_t exeaddr;
p80211item_uint32_t resultcode;
struct p80211item_uint32 enable;
struct p80211item_uint32 exeaddr;
struct p80211item_uint32 resultcode;
} __packed;
struct p80211msg_p2req_ramdl_write {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
p80211item_uint32_t addr;
p80211item_uint32_t len;
struct p80211item_uint32 addr;
struct p80211item_uint32 len;
p80211item_unk4096_t data;
p80211item_uint32_t resultcode;
struct p80211item_uint32 resultcode;
} __packed;
struct p80211msg_p2req_flashdl_state {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
p80211item_uint32_t enable;
p80211item_uint32_t resultcode;
struct p80211item_uint32 enable;
struct p80211item_uint32 resultcode;
} __packed;
struct p80211msg_p2req_flashdl_write {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
p80211item_uint32_t addr;
p80211item_uint32_t len;
struct p80211item_uint32 addr;
struct p80211item_uint32 len;
p80211item_unk4096_t data;
p80211item_uint32_t resultcode;
struct p80211item_uint32 resultcode;
} __packed;
#endif
drivers/staging/wlan-ng/p80211netdev.c
View file @ b26b2325
......@@ -616,7 +616,7 @@ static int p80211knetdev_set_mac_address(netdevice_t *dev, void *addr)
struct p80211msg_dot11req_mibset dot11req;
p80211item_unk392_t *mibattr;
p80211item_pstr6_t *macaddr;
p80211item_uint32_t *resultcode;
struct p80211item_uint32 *resultcode;
int result;
/* If we're running, we don't allow MAC address changes */
......
drivers/staging/wlan-ng/p80211types.h
View file @ b26b2325
......@@ -270,12 +270,12 @@ struct p80211itemd {
} __packed;
/* message data item for int, BOUNDEDINT, ENUMINT */
typedef struct p80211item_uint32 {
struct p80211item_uint32 {
u32 did;
u16 status;
u16 len;
u32 data;
} __packed p80211item_uint32_t;
} __packed;
/* message data item for OCTETSTR, DISPLAYSTR */
typedef struct p80211item_pstr6 {
......
drivers/staging/wlan-ng/prism2sta.c
View file @ b26b2325
......@@ -1916,7 +1916,7 @@ void prism2sta_commsqual_defer(struct work_struct *data)
struct wlandevice *wlandev = hw->wlandev;
hfa384x_bytestr32_t ssid;
struct p80211msg_dot11req_mibget msg;
p80211item_uint32_t *mibitem = (p80211item_uint32_t *)
struct p80211item_uint32 *mibitem = (struct p80211item_uint32 *)
&msg.mibattribute.data;
int result = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7