X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fnet%2Fskge.h;fp=drivers%2Fnet%2Fskge.h;h=941f12a333b63939f3a1257dffd6ee6dcc3e7d4b;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=593387b3c0dd039d9c44c33e29d5a471ce7769c6;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/net/skge.h b/drivers/net/skge.h
index 593387b3c..941f12a33 100644
--- 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	= 7<<10, /* Bit 12..10:	Collision Threshold */
+	GM_TXCR_COL_THR_MSK	= 1<<10, /* Bit 12..10:	Collision Threshold */
 };
 
 #define TX_COL_THR(x)		(((x)<<10) & GM_TXCR_COL_THR_MSK)
-#define TX_COL_DEF		0x04	/* late collision after 64 byte */
+#define TX_COL_DEF		0x04
 
 /*	GM_RX_CTRL			16 bit r/w	Receive Control Register */
 enum {
@@ -2388,7 +2388,6 @@ struct skge_ring {
 struct skge_hw {
 	void __iomem  	     *regs;
 	struct pci_dev	     *pdev;
-	spinlock_t	     hw_lock;
 	u32		     intr_mask;
 	struct net_device    *dev[2];
 
@@ -2400,8 +2399,10 @@ struct skge_hw {
 	u32	     	     ram_size;
 	u32	     	     ram_offset;
 	u16		     phy_addr;
-	struct work_struct   phy_work;
-	struct mutex	     phy_mutex;
+
+	struct tasklet_struct ext_tasklet;
+	spinlock_t	     phy_lock;
+	spinlock_t	     hw_lock;
 };
 
 enum {
@@ -2418,6 +2419,7 @@ struct skge_port {
 	int		     port;
 
 	spinlock_t	     tx_lock;
+	u32		     tx_avail;
 	struct skge_ring     tx_ring;
 	struct skge_ring     rx_ring;