1 files changed, 19 insertions, 18 deletions

diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index 8a0bc5525f0a..4c13c371bc21 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -1318,6 +1318,14 @@ enum {
 };
 
 /* for Yukon-2 Gigabit Ethernet PHY (88E1112 only) */
+/*****  PHY_MARV_PHY_CTRL (page 1)              16 bit r/w      Fiber Specific Ctrl *****/
+enum {
+        PHY_M_FIB_FORCE_LNK     = 1<<10,/* Force Link Good */
+        PHY_M_FIB_SIGD_POL      = 1<<9, /* SIGDET Polarity */
+        PHY_M_FIB_TX_DIS        = 1<<3, /* Transmitter Disable */
+};
+
+/* for Yukon-2 Gigabit Ethernet PHY (88E1112 only) */
 /*****  PHY_MARV_PHY_CTRL (page 2)              16 bit r/w      MAC Specific Ctrl *****/
 enum {
         PHY_M_MAC_MD_MSK        = 7<<7, /* Bit  9.. 7: Mode Select Mask */
@@ -1480,7 +1488,7 @@ enum {
         GM_TXCR_FORCE_JAM       = 1<<15, /* Bit 15:     Force Jam / Flow-Control */
         GM_TXCR_CRC_DIS         = 1<<14, /* Bit 14:     Disable insertion of CRC */
         GM_TXCR_PAD_DIS         = 1<<13, /* Bit 13:     Disable padding of packets */
-        GM_TXCR_COL_THR_MSK     = 1<<10, /* Bit 12..10: Collision Threshold */
+        GM_TXCR_COL_THR_MSK     = 7<<10, /* Bit 12..10: Collision Threshold */
 };
 
 #define TX_COL_THR(x)           (((x)<<10) & GM_TXCR_COL_THR_MSK)
@@ -1566,7 +1574,7 @@ enum {
 
         GMR_FS_ANY_ERR  = GMR_FS_RX_FF_OV | GMR_FS_CRC_ERR |
                           GMR_FS_FRAGMENT | GMR_FS_LONG_ERR |
-                          GMR_FS_MII_ERR | GMR_FS_BAD_FC | GMR_FS_GOOD_FC |
+                          GMR_FS_MII_ERR | GMR_FS_BAD_FC |
                           GMR_FS_UN_SIZE | GMR_FS_JABBER,
 };
 
@@ -1748,7 +1756,6 @@ enum {
         INIT_SUM= 1<<3,
         LOCK_SUM= 1<<4,
         INS_VLAN= 1<<5,
-        FRC_STAT= 1<<6,
         EOP     = 1<<7,
 };
 
@@ -1784,21 +1791,9 @@ enum {
         OP_TXINDEXLE    = 0x68,
 };
 
-/* Yukon 2 hardware interface
- * Not tested on big endian
- */
+/* Yukon 2 hardware interface */
 struct sky2_tx_le {
-        union {
-                __le32  addr;
-                struct {
-                        __le16  offset;
-                        __le16  start;
-                } csum  __attribute((packed));
-                struct {
-                        __le16  size;
-                        __le16  rsvd;
-                } tso  __attribute((packed));
-        } tx;
+        __le32  addr;
         __le16  length; /* also vlan tag or checksum start */
         u8      ctrl;
         u8      opcode;
@@ -1844,6 +1839,7 @@ struct sky2_port {
         u32                  tx_addr64;
         u16                  tx_pending;
         u16                  tx_last_mss;
+        u32                  tx_tcpsum;
 
         struct ring_info     *rx_ring ____cacheline_aligned_in_smp;
         struct sky2_rx_le    *rx_le;
@@ -1879,7 +1875,7 @@ struct sky2_hw {
         int                  pm_cap;
         u8                   chip_id;
         u8                   chip_rev;
-        u8                   copper;
+        u8                   pmd_type;
         u8                   ports;
 
         struct sky2_status_le *st_le;
@@ -1891,6 +1887,11 @@ struct sky2_hw {
         wait_queue_head_t    msi_wait;
 };
 
+static inline int sky2_is_copper(const struct sky2_hw *hw)
+{
+        return !(hw->pmd_type == 'L' || hw->pmd_type == 'S' || hw->pmd_type == 'P');
+}
+
 /* Register accessor for memory mapped device */
 static inline u32 sky2_read32(const struct sky2_hw *hw, unsigned reg)
 {