Merge branch 'upstream-fixes' into upstream

[pandora-kernel.git] / drivers / net / skge.h

diff --git a/drivers/net/skge.h b/drivers/net/skge.h
index ed19ff4..79e0927 100644 (file)
--- a/drivers/net/skge.h
+++ b/drivers/net/skge.h
@@ -1734,11 +1734,11 @@ 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)
-#define TX_COL_DEF             0x04
+#define TX_COL_DEF             0x04    /* late collision after 64 byte */
 
 /*     GM_RX_CTRL                      16 bit r/w      Receive Control Register */
 enum {
@@ -2417,7 +2417,6 @@ struct skge_port {
        struct net_device    *netdev;
        int                  port;
 
-       spinlock_t           tx_lock;
        struct skge_ring     tx_ring;
        struct skge_ring     rx_ring;