Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into...

[sfrench/cifs-2.6.git] / drivers / net / via-velocity.h

diff --git a/drivers/net/via-velocity.h b/drivers/net/via-velocity.h
index f1b2640ebdc660a1ce605ad3796f413339244119..b9e114d36c0f67efc3a13fbfc0e55f6870e0eca6 100644 (file)
--- a/drivers/net/via-velocity.h
+++ b/drivers/net/via-velocity.h
@@ -29,7 +29,9 @@
 
 #define VELOCITY_NAME          "via-velocity"
 #define VELOCITY_FULL_DRV_NAM  "VIA Networking Velocity Family Gigabit Ethernet Adapter Driver"
-#define VELOCITY_VERSION       "1.13"
+#define VELOCITY_VERSION       "1.14"
+
+#define VELOCITY_IO_SIZE       256
 
 #define PKT_BUF_SZ          1540
 
@@ -244,7 +246,7 @@ struct tdesc1 {
 struct td_buf {
        u32 pa_low;
        u16 pa_high;
-       u16 bufsize:14; 
+       u16 bufsize:14;
        u16 reserved:1;
        u16 queue:1;
 } __attribute__ ((__packed__));
@@ -260,25 +262,6 @@ struct velocity_rd_info {
        dma_addr_t skb_dma;
 };
 
-/**
- *     alloc_rd_info           -       allocate an rd info block
- *
- *     Alocate and initialize a receive info structure used for keeping
- *     track of kernel side information related to each receive
- *     descriptor we are using
- */
-
-static inline struct velocity_rd_info *alloc_rd_info(void)
-{
-       struct velocity_rd_info *ptr;
-       if ((ptr = kmalloc(sizeof(struct velocity_rd_info), GFP_ATOMIC)) == NULL)
-               return NULL;
-       else {
-               memset(ptr, 0, sizeof(struct velocity_rd_info));
-               return ptr;
-       }
-}
-
 /*
  *     Used to track transmit side buffers.
  */
@@ -1191,7 +1174,6 @@ enum chip_type {
 struct velocity_info_tbl {
        enum chip_type chip_id;
        char *name;
-       int io_size;
        int txqueue;
        u32 flags;
 };
@@ -1751,7 +1733,6 @@ struct velocity_info {
        struct mac_regs __iomem * mac_regs;
        unsigned long memaddr;
        unsigned long ioaddr;
-       u32 io_size;
 
        u8 rev_id;