mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 18:09:57 +00:00
Staging: wlan-ng: remove typedef in p80211hdr.h
This patch removes the only typedef in p80211hdr.h. Signed-off-by: Edgardo Hames <ehames@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
b6bb56e6aa
commit
3d049431e0
6 changed files with 13 additions and 13 deletions
|
@ -311,7 +311,7 @@ int prism2_get_station(struct wiphy *wiphy, struct net_device *dev,
|
||||||
if (wlandev->mlmerequest == NULL)
|
if (wlandev->mlmerequest == NULL)
|
||||||
return -EOPNOTSUPP;
|
return -EOPNOTSUPP;
|
||||||
|
|
||||||
result = wlandev->mlmerequest(wlandev, (p80211msg_t *) &quality);
|
result = wlandev->mlmerequest(wlandev, (struct p80211msg *) &quality);
|
||||||
|
|
||||||
|
|
||||||
if (result == 0) {
|
if (result == 0) {
|
||||||
|
|
|
@ -50,10 +50,10 @@
|
||||||
|
|
||||||
#define WLAN_DEVNAMELEN_MAX 16
|
#define WLAN_DEVNAMELEN_MAX 16
|
||||||
|
|
||||||
typedef struct p80211msg {
|
struct p80211msg {
|
||||||
u32 msgcode;
|
u32 msgcode;
|
||||||
u32 msglen;
|
u32 msglen;
|
||||||
u8 devname[WLAN_DEVNAMELEN_MAX];
|
u8 devname[WLAN_DEVNAMELEN_MAX];
|
||||||
} __attribute__ ((packed)) p80211msg_t;
|
} __attribute__ ((packed));
|
||||||
|
|
||||||
#endif /* _P80211MSG_H */
|
#endif /* _P80211MSG_H */
|
||||||
|
|
|
@ -186,7 +186,7 @@ typedef struct wlandevice {
|
||||||
int (*txframe) (struct wlandevice *wlandev, struct sk_buff *skb,
|
int (*txframe) (struct wlandevice *wlandev, struct sk_buff *skb,
|
||||||
union p80211_hdr *p80211_hdr,
|
union p80211_hdr *p80211_hdr,
|
||||||
struct p80211_metawep *p80211_wep);
|
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,
|
int (*set_multicast_list) (struct wlandevice *wlandev,
|
||||||
netdevice_t *dev);
|
netdevice_t *dev);
|
||||||
void (*tx_timeout) (struct wlandevice *wlandev);
|
void (*tx_timeout) (struct wlandevice *wlandev);
|
||||||
|
|
|
@ -72,7 +72,7 @@
|
||||||
#include "p80211metastruct.h"
|
#include "p80211metastruct.h"
|
||||||
#include "p80211req.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,
|
static int p80211req_mibset_mibget(wlandevice_t *wlandev,
|
||||||
struct p80211msg_dot11req_mibget *mib_msg,
|
struct p80211msg_dot11req_mibget *mib_msg,
|
||||||
int isget);
|
int isget);
|
||||||
|
@ -96,7 +96,7 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev,
|
||||||
int p80211req_dorequest(wlandevice_t *wlandev, u8 *msgbuf)
|
int p80211req_dorequest(wlandevice_t *wlandev, u8 *msgbuf)
|
||||||
{
|
{
|
||||||
int result = 0;
|
int result = 0;
|
||||||
p80211msg_t *msg = (p80211msg_t *) msgbuf;
|
struct p80211msg *msg = (struct p80211msg *) msgbuf;
|
||||||
|
|
||||||
/* Check to make sure the MSD is running */
|
/* Check to make sure the MSD is running */
|
||||||
if (!((wlandev->msdstate == WLAN_MSD_HWPRESENT &&
|
if (!((wlandev->msdstate == WLAN_MSD_HWPRESENT &&
|
||||||
|
@ -150,7 +150,7 @@ int p80211req_dorequest(wlandevice_t *wlandev, u8 *msgbuf)
|
||||||
* Call context:
|
* Call context:
|
||||||
* Process thread
|
* 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) {
|
switch (msg->msgcode) {
|
||||||
|
|
||||||
|
|
|
@ -983,7 +983,7 @@ int writeimage(wlandevice_t *wlandev, struct imgchunk *fchunk,
|
||||||
int result = 0;
|
int result = 0;
|
||||||
struct p80211msg_p2req_ramdl_state rstatemsg;
|
struct p80211msg_p2req_ramdl_state rstatemsg;
|
||||||
struct p80211msg_p2req_ramdl_write rwritemsg;
|
struct p80211msg_p2req_ramdl_write rwritemsg;
|
||||||
p80211msg_t *msgp;
|
struct p80211msg *msgp;
|
||||||
u32 resultcode;
|
u32 resultcode;
|
||||||
int i;
|
int i;
|
||||||
int j;
|
int j;
|
||||||
|
@ -1029,7 +1029,7 @@ int writeimage(wlandevice_t *wlandev, struct imgchunk *fchunk,
|
||||||
rstatemsg.enable.data = P80211ENUM_truth_true;
|
rstatemsg.enable.data = P80211ENUM_truth_true;
|
||||||
rstatemsg.exeaddr.data = startaddr;
|
rstatemsg.exeaddr.data = startaddr;
|
||||||
|
|
||||||
msgp = (p80211msg_t *) &rstatemsg;
|
msgp = (struct p80211msg *) &rstatemsg;
|
||||||
result = prism2mgmt_ramdl_state(wlandev, msgp);
|
result = prism2mgmt_ramdl_state(wlandev, msgp);
|
||||||
if (result) {
|
if (result) {
|
||||||
printk(KERN_ERR
|
printk(KERN_ERR
|
||||||
|
@ -1070,7 +1070,7 @@ int writeimage(wlandevice_t *wlandev, struct imgchunk *fchunk,
|
||||||
("Sending xxxdl_write message addr=%06x len=%d.\n",
|
("Sending xxxdl_write message addr=%06x len=%d.\n",
|
||||||
currdaddr, currlen);
|
currdaddr, currlen);
|
||||||
|
|
||||||
msgp = (p80211msg_t *) &rwritemsg;
|
msgp = (struct p80211msg *) &rwritemsg;
|
||||||
result = prism2mgmt_ramdl_write(wlandev, msgp);
|
result = prism2mgmt_ramdl_write(wlandev, msgp);
|
||||||
|
|
||||||
/* Check the results */
|
/* Check the results */
|
||||||
|
@ -1097,7 +1097,7 @@ int writeimage(wlandevice_t *wlandev, struct imgchunk *fchunk,
|
||||||
rstatemsg.enable.data = P80211ENUM_truth_false;
|
rstatemsg.enable.data = P80211ENUM_truth_false;
|
||||||
rstatemsg.exeaddr.data = 0;
|
rstatemsg.exeaddr.data = 0;
|
||||||
|
|
||||||
msgp = (p80211msg_t *) &rstatemsg;
|
msgp = (struct p80211msg *) &rstatemsg;
|
||||||
result = prism2mgmt_ramdl_state(wlandev, msgp);
|
result = prism2mgmt_ramdl_state(wlandev, msgp);
|
||||||
if (result) {
|
if (result) {
|
||||||
printk(KERN_ERR
|
printk(KERN_ERR
|
||||||
|
|
|
@ -132,7 +132,7 @@ static void prism2sta_reset(wlandevice_t *wlandev);
|
||||||
static int prism2sta_txframe(wlandevice_t *wlandev, struct sk_buff *skb,
|
static int prism2sta_txframe(wlandevice_t *wlandev, struct sk_buff *skb,
|
||||||
union p80211_hdr *p80211_hdr,
|
union p80211_hdr *p80211_hdr,
|
||||||
struct p80211_metawep *p80211_wep);
|
struct p80211_metawep *p80211_wep);
|
||||||
static int prism2sta_mlmerequest(wlandevice_t *wlandev, p80211msg_t *msg);
|
static int prism2sta_mlmerequest(wlandevice_t *wlandev, struct p80211msg *msg);
|
||||||
static int prism2sta_getcardinfo(wlandevice_t *wlandev);
|
static int prism2sta_getcardinfo(wlandevice_t *wlandev);
|
||||||
static int prism2sta_globalsetup(wlandevice_t *wlandev);
|
static int prism2sta_globalsetup(wlandevice_t *wlandev);
|
||||||
static int prism2sta_setmulticast(wlandevice_t *wlandev, netdevice_t *dev);
|
static int prism2sta_setmulticast(wlandevice_t *wlandev, netdevice_t *dev);
|
||||||
|
@ -309,7 +309,7 @@ static int prism2sta_txframe(wlandevice_t *wlandev, struct sk_buff *skb,
|
||||||
* Call context:
|
* Call context:
|
||||||
* process thread
|
* process thread
|
||||||
----------------------------------------------------------------*/
|
----------------------------------------------------------------*/
|
||||||
static int prism2sta_mlmerequest(wlandevice_t *wlandev, p80211msg_t *msg)
|
static int prism2sta_mlmerequest(wlandevice_t *wlandev, struct p80211msg *msg)
|
||||||
{
|
{
|
||||||
hfa384x_t *hw = (hfa384x_t *) wlandev->priv;
|
hfa384x_t *hw = (hfa384x_t *) wlandev->priv;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue