1 files changed, 18 insertions, 3 deletions

diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index 0bebfb3638f6..084eff21b67a 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -694,8 +694,21 @@ enum {
         TXA_CTRL        = 0x0210,/*  8 bit      Tx Arbiter Control Register */
         TXA_TEST        = 0x0211,/*  8 bit      Tx Arbiter Test Register */
         TXA_STAT        = 0x0212,/*  8 bit      Tx Arbiter Status Register */
+
+        RSS_KEY         = 0x0220, /* RSS Key setup */
+        RSS_CFG         = 0x0248, /* RSS Configuration */
 };
 
+enum {
+        HASH_TCP_IPV6_EX_CTRL   = 1<<5,
+        HASH_IPV6_EX_CTRL       = 1<<4,
+        HASH_TCP_IPV6_CTRL      = 1<<3,
+        HASH_IPV6_CTRL          = 1<<2,
+        HASH_TCP_IPV4_CTRL      = 1<<1,
+        HASH_IPV4_CTRL          = 1<<0,
+
+        HASH_ALL                = 0x3f,
+};
 
 enum {
         B6_EXT_REG      = 0x0300,/* External registers (GENESIS only) */
@@ -2169,14 +2182,14 @@ struct tx_ring_info {
         unsigned long flags;
 #define TX_MAP_SINGLE   0x0001
 #define TX_MAP_PAGE     0x0002
-        DECLARE_PCI_UNMAP_ADDR(mapaddr);
-        DECLARE_PCI_UNMAP_LEN(maplen);
+        DEFINE_DMA_UNMAP_ADDR(mapaddr);
+        DEFINE_DMA_UNMAP_LEN(maplen);
 };
 
 struct rx_ring_info {
         struct sk_buff  *skb;
         dma_addr_t      data_addr;
-        DECLARE_PCI_UNMAP_LEN(data_size);
+        DEFINE_DMA_UNMAP_LEN(data_size);
         dma_addr_t      frag_addr[ETH_JUMBO_MTU >> PAGE_SHIFT];
 };
 
@@ -2261,6 +2274,7 @@ struct sky2_hw {
 #define SKY2_HW_NEW_LE          0x00000020      /* new LSOv2 format */
 #define SKY2_HW_AUTO_TX_SUM     0x00000040      /* new IP decode for Tx */
 #define SKY2_HW_ADV_POWER_CTL   0x00000080      /* additional PHY power regs */
+#define SKY2_HW_RSS_BROKEN      0x00000100
 
         u8                   chip_id;
         u8                   chip_rev;
@@ -2268,6 +2282,7 @@ struct sky2_hw {
         u8                   ports;
 
         struct sky2_status_le *st_le;
+        u32                  st_size;
         u32                  st_idx;
         dma_addr_t           st_dma;