1 files changed, 10 insertions, 5 deletions

diff --git a/drivers/net/via-velocity.h b/drivers/net/via-velocity.h
index 2f00c13ab502..ef4a0f64ba16 100644
--- a/drivers/net/via-velocity.h
+++ b/drivers/net/via-velocity.h
@@ -29,9 +29,10 @@
 
 #define VELOCITY_NAME          "via-velocity"
 #define VELOCITY_FULL_DRV_NAM  "VIA Networking Velocity Family Gigabit Ethernet Adapter Driver"
-#define VELOCITY_VERSION       "1.14"
+#define VELOCITY_VERSION       "1.15"
 
 #define VELOCITY_IO_SIZE        256
+#define VELOCITY_NAPI_WEIGHT    64
 
 #define PKT_BUF_SZ          1540
 
@@ -1005,7 +1006,8 @@ struct mac_regs {
 
         volatile __le32 RDBaseLo;       /* 0x38 */
         volatile __le16 RDIdx;          /* 0x3C */
-        volatile __le16 reserved_3E;
+        volatile u8 TQETMR;             /* 0x3E, VT3216 and above only */
+        volatile u8 RQETMR;             /* 0x3F, VT3216 and above only */
 
         volatile __le32 TDBaseLo[4];    /* 0x40 */
 
@@ -1421,7 +1423,6 @@ enum velocity_msg_level {
  */
 
 #define     VELOCITY_FLAGS_TAGGING         0x00000001UL
-#define     VELOCITY_FLAGS_TX_CSUM         0x00000002UL
 #define     VELOCITY_FLAGS_RX_CSUM         0x00000004UL
 #define     VELOCITY_FLAGS_IP_ALIGN        0x00000008UL
 #define     VELOCITY_FLAGS_VAL_PKT_LEN     0x00000010UL
@@ -1491,6 +1492,10 @@ struct velocity_opt {
         int rx_bandwidth_hi;
         int rx_bandwidth_lo;
         int rx_bandwidth_en;
+        int rxqueue_timer;
+        int txqueue_timer;
+        int tx_intsup;
+        int rx_intsup;
         u32 flags;
 };
 
@@ -1499,8 +1504,6 @@ struct velocity_opt {
 #define GET_RD_BY_IDX(vptr, idx)   (vptr->rd_ring[idx])
 
 struct velocity_info {
-        struct list_head list;
-
         struct pci_dev *pdev;
         struct net_device *dev;
 
@@ -1559,6 +1562,8 @@ struct velocity_info {
         u32 ticks;
 
         u8 rev_id;
+
+        struct napi_struct napi;
 };
 
 /**