staging: wlang-ng: avoid new typedef: hfa384x_pdr_refdac_measurements_t

[cascardo/linux.git] / drivers / staging / wlan-ng / p80211netdev.h

diff --git a/drivers/staging/wlan-ng/p80211netdev.h b/drivers/staging/wlan-ng/p80211netdev.h
index 820a0e2..1e6a774 100644 (file)
--- a/drivers/staging/wlan-ng/p80211netdev.h
+++ b/drivers/staging/wlan-ng/p80211netdev.h
@@ -57,9 +57,6 @@
 #include <linux/wireless.h>
 #include <linux/netdevice.h>
 
-#undef netdevice_t
-typedef struct net_device netdevice_t;
-
 #define WLAN_RELEASE   "0.3.0-staging"
 
 #define WLAN_DEVICE_CLOSED     0
@@ -101,7 +98,7 @@ typedef struct net_device netdevice_t;
 #define P80211_NSDCAP_NOSCAN                0x200 /* nsd can scan */
 
 /* Received frame statistics */
-typedef struct p80211_frmrx_t {
+struct p80211_frmrx {
        u32 mgmt;
        u32 assocreq;
        u32 assocresp;
@@ -135,10 +132,10 @@ typedef struct p80211_frmrx_t {
        u32 data_unknown;
        u32 decrypt;
        u32 decrypt_err;
-} p80211_frmrx_t;
+};
 
 /* called by /proc/net/wireless */
-struct iw_statistics *p80211wext_get_wireless_stats(netdevice_t *dev);
+struct iw_statistics *p80211wext_get_wireless_stats(struct net_device *dev);
 /* wireless extensions' ioctls */
 extern struct iw_handler_def p80211wext_handler_def;
 
@@ -157,7 +154,7 @@ extern int wlan_watchdog;
 extern int wlan_wext_write;
 
 /* WLAN device type */
-typedef struct wlandevice {
+struct wlandevice {
        void *priv;             /* private data for MSD */
 
        /* Subsystem State */
@@ -186,12 +183,12 @@ typedef struct wlandevice {
                        struct p80211_metawep *p80211_wep);
        int (*mlmerequest)(struct wlandevice *wlandev, struct p80211msg *msg);
        int (*set_multicast_list)(struct wlandevice *wlandev,
-                                  netdevice_t *dev);
+                                  struct net_device *dev);
        void (*tx_timeout)(struct wlandevice *wlandev);
 
        /* 802.11 State */
        u8 bssid[WLAN_BSSID_LEN];
-       p80211pstr32_t ssid;
+       struct p80211pstr32 ssid;
        u32 macmode;
        int linkstatus;
 
@@ -206,7 +203,7 @@ typedef struct wlandevice {
        /* netlink socket */
        /* queue for indications waiting for cmd completion */
        /* Linux netdevice and support */
-       netdevice_t *netdev;    /* ptr to linux netdevice */
+       struct net_device *netdev;      /* ptr to linux netdevice */
 
        /* Rx bottom half */
        struct tasklet_struct rx_bh;
@@ -214,7 +211,7 @@ typedef struct wlandevice {
        struct sk_buff_head nsd_rxq;
 
        /* 802.11 device statistics */
-       struct p80211_frmrx_t rx;
+       struct p80211_frmrx rx;
 
        struct iw_statistics wstats;
 
@@ -222,19 +219,19 @@ typedef struct wlandevice {
        u8 spy_number;
        char spy_address[IW_MAX_SPY][ETH_ALEN];
        struct iw_quality spy_stat[IW_MAX_SPY];
-} wlandevice_t;
+};
 
 /* WEP stuff */
-int wep_change_key(wlandevice_t *wlandev, int keynum, u8 *key, int keylen);
-int wep_decrypt(wlandevice_t *wlandev, u8 *buf, u32 len, int key_override,
-               u8 *iv, u8 *icv);
-int wep_encrypt(wlandevice_t *wlandev, u8 *buf, u8 *dst, u32 len, int keynum,
+int wep_change_key(struct wlandevice *wlandev, int keynum, u8 *key, int keylen);
+int wep_decrypt(struct wlandevice *wlandev, u8 *buf, u32 len, int key_override,
                u8 *iv, u8 *icv);
-
-int wlan_setup(wlandevice_t *wlandev, struct device *physdev);
-void wlan_unsetup(wlandevice_t *wlandev);
-int register_wlandev(wlandevice_t *wlandev);
-int unregister_wlandev(wlandevice_t *wlandev);
-void p80211netdev_rx(wlandevice_t *wlandev, struct sk_buff *skb);
-void p80211netdev_hwremoved(wlandevice_t *wlandev);
+int wep_encrypt(struct wlandevice *wlandev, u8 *buf, u8 *dst, u32 len,
+               int keynum, u8 *iv, u8 *icv);
+
+int wlan_setup(struct wlandevice *wlandev, struct device *physdev);
+void wlan_unsetup(struct wlandevice *wlandev);
+int register_wlandev(struct wlandevice *wlandev);
+int unregister_wlandev(struct wlandevice *wlandev);
+void p80211netdev_rx(struct wlandevice *wlandev, struct sk_buff *skb);
+void p80211netdev_hwremoved(struct wlandevice *wlandev);
 #endif