Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / staging / wlan-ng / hfa384x.h

diff --git a/drivers/staging/wlan-ng/hfa384x.h b/drivers/staging/wlan-ng/hfa384x.h
index 8f2091070491fce457c0e29ffb7ddcf8af61a9f5..8dfe4381ddf76fa3a3aa9ddfb6d0cf8a878681cb 100644 (file)
--- a/drivers/staging/wlan-ng/hfa384x.h
+++ b/drivers/staging/wlan-ng/hfa384x.h
@@ -1204,19 +1204,19 @@ typedef struct hfa484x_metacmd {
 #define WLAN_ACCESS_DENY       3   /* Do not authenticate "denied" stations. */
 
 /* XXX These are going away ASAP */
-typedef struct prism2sta_authlist {
+struct prism2sta_authlist {
        unsigned int cnt;
        u8 addr[WLAN_AUTH_MAX][ETH_ALEN];
        u8 assoc[WLAN_AUTH_MAX];
-} prism2sta_authlist_t;
+};
 
-typedef struct prism2sta_accesslist {
+struct prism2sta_accesslist {
        unsigned int modify;
        unsigned int cnt;
        u8 addr[WLAN_ACCESS_MAX][ETH_ALEN];
        unsigned int cnt1;
        u8 addr1[WLAN_ACCESS_MAX][ETH_ALEN];
-} prism2sta_accesslist_t;
+};
 
 typedef struct hfa384x {
        /* USB support data */
@@ -1348,10 +1348,10 @@ typedef struct hfa384x {
 
        hfa384x_InfFrame_t *scanresults;
 
-       prism2sta_authlist_t authlist;  /* Authenticated station list. */
-       unsigned int accessmode;        /* Access mode. */
-       prism2sta_accesslist_t allow;   /* Allowed station list. */
-       prism2sta_accesslist_t deny;    /* Denied station list. */
+       struct prism2sta_authlist authlist;     /* Authenticated station list. */
+       unsigned int accessmode;                /* Access mode. */
+       struct prism2sta_accesslist allow;      /* Allowed station list. */
+       struct prism2sta_accesslist deny;       /* Denied station list. */
 
 } hfa384x_t;
 
@@ -1413,7 +1413,8 @@ int hfa384x_drvr_start(hfa384x_t *hw);
 int hfa384x_drvr_stop(hfa384x_t *hw);
 int
 hfa384x_drvr_txframe(hfa384x_t *hw, struct sk_buff *skb,
-                    union p80211_hdr *p80211_hdr, struct p80211_metawep *p80211_wep);
+                    union p80211_hdr *p80211_hdr,
+                    struct p80211_metawep *p80211_wep);
 void hfa384x_tx_timeout(wlandevice_t *wlandev);
 
 int hfa384x_cmd_initialize(hfa384x_t *hw);