Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / drivers / net / wireless / wavelan_cs.p.h

diff --git a/drivers/net/wireless/wavelan_cs.p.h b/drivers/net/wireless/wavelan_cs.p.h
index 33dd970..706fd30 100644 (file)
--- a/drivers/net/wireless/wavelan_cs.p.h
+++ b/drivers/net/wireless/wavelan_cs.p.h
@@ -576,7 +576,6 @@ struct wavepoint_table
 /****************************** TYPES ******************************/
 
 /* Shortcuts */
-typedef struct net_device_stats        en_stats;
 typedef struct iw_statistics   iw_stats;
 typedef struct iw_quality      iw_qual;
 typedef struct iw_freq         iw_freq;
@@ -592,8 +591,6 @@ typedef u_char              mac_addr[WAVELAN_ADDR_SIZE];    /* Hardware address */
  * For each network interface, Linux keep data in two structure. "device"
  * keep the generic data (same format for everybody) and "net_local" keep
  * the additional specific data.
- * Note that some of this specific data is in fact generic (en_stats, for
- * example).
  */
 struct net_local
 {
@@ -601,7 +598,6 @@ struct net_local
   struct net_device *  dev;            /* Reverse link... */
   spinlock_t   spinlock;       /* Serialize access to the hardware (SMP) */
   struct pcmcia_device *       link;           /* pcmcia structure */
-  en_stats     stats;          /* Ethernet interface statistics */
   int          nresets;        /* Number of hw resets */
   u_char       configured;     /* If it is configured */
   u_char       reconfig_82593; /* Need to reconfigure the controller */
@@ -637,7 +633,7 @@ struct net_local
 /* ----------------- MODEM MANAGEMENT SUBROUTINES ----------------- */
 static inline u_char           /* data */
        hasr_read(u_long);      /* Read the host interface : base address */
-static inline void
+static void
        hacr_write(u_long,      /* Write to host interface : base address */
                   u_char),     /* data */
        hacr_write_slow(u_long,
@@ -651,7 +647,7 @@ static void
                  int,          /* Offset in psa */
                  u_char *,     /* Buffer in memory */
                  int);         /* Length of buffer */
-static inline void
+static void
        mmc_out(u_long,         /* Write 1 byte to the Modem Manag Control */
                u_short,
                u_char),
@@ -659,10 +655,10 @@ static inline void
                  u_char,
                  u_char *,
                  int);
-static inline u_char           /* Read 1 byte from the MMC */
+static u_char                  /* Read 1 byte from the MMC */
        mmc_in(u_long,
               u_short);
-static inline void
+static void
        mmc_read(u_long,        /* Read n bytes from the MMC */
                 u_char,
                 u_char *,
@@ -688,28 +684,26 @@ static int
                     int,
                     char *,
                     int);
-static inline void
+static void
        wv_82593_reconfig(struct net_device *); /* Reconfigure the controller */
 /* ------------------- DEBUG & INFO SUBROUTINES ------------------- */
-static inline void
+static void
        wv_init_info(struct net_device *);      /* display startup info */
 /* ------------------- IOCTL, STATS & RECONFIG ------------------- */
-static en_stats        *
-       wavelan_get_stats(struct net_device *); /* Give stats /proc/net/dev */
 static iw_stats *
        wavelan_get_wireless_stats(struct net_device *);
 /* ----------------------- PACKET RECEPTION ----------------------- */
-static inline int
+static int
        wv_start_of_frame(struct net_device *,  /* Seek beggining of current frame */
                          int,  /* end of frame */
                          int); /* start of buffer */
-static inline void
+static void
        wv_packet_read(struct net_device *,     /* Read a packet from a frame */
                       int,
                       int),
        wv_packet_rcv(struct net_device *);     /* Read all packets waiting */
 /* --------------------- PACKET TRANSMISSION --------------------- */
-static inline void
+static void
        wv_packet_write(struct net_device *,    /* Write a packet to the Tx buffer */
                        void *,
                        short);
@@ -717,20 +711,20 @@ static int
        wavelan_packet_xmit(struct sk_buff *,   /* Send a packet */
                            struct net_device *);
 /* -------------------- HARDWARE CONFIGURATION -------------------- */
-static inline int
+static int
        wv_mmc_init(struct net_device *);       /* Initialize the modem */
 static int
        wv_ru_stop(struct net_device *),        /* Stop the i82593 receiver unit */
        wv_ru_start(struct net_device *);       /* Start the i82593 receiver unit */
 static int
        wv_82593_config(struct net_device *);   /* Configure the i82593 */
-static inline int
+static int
        wv_pcmcia_reset(struct net_device *);   /* Reset the pcmcia interface */
 static int
        wv_hw_config(struct net_device *);      /* Reset & configure the whole hardware */
-static inline void
+static void
        wv_hw_reset(struct net_device *);       /* Same, + start receiver unit */
-static inline int
+static int
        wv_pcmcia_config(struct pcmcia_device *);       /* Configure the pcmcia interface */
 static void
        wv_pcmcia_release(struct pcmcia_device *);/* Remove a device */