X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Fskge.h;h=ed19ff47ce1108dc0f6a3ac89935391f7c7fa961;hb=722f4f5b2600b8930b63a096e48b878cd6e0e15a;hp=941f12a333b63939f3a1257dffd6ee6dcc3e7d4b;hpb=c6ee60b7c8bbc78e3b1776b2820a7e7f95f8996a;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/net/skge.h b/drivers/net/skge.h
index 941f12a333b..ed19ff47ce1 100644
--- a/drivers/net/skge.h
+++ b/drivers/net/skge.h
@@ -2388,6 +2388,7 @@ 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];
 
@@ -2399,10 +2400,8 @@ struct skge_hw {
 	u32	     	     ram_size;
 	u32	     	     ram_offset;
 	u16		     phy_addr;
-
-	struct tasklet_struct ext_tasklet;
-	spinlock_t	     phy_lock;
-	spinlock_t	     hw_lock;
+	struct work_struct   phy_work;
+	struct mutex	     phy_mutex;
 };
 
 enum {
@@ -2419,7 +2418,6 @@ struct skge_port {
 	int		     port;
 
 	spinlock_t	     tx_lock;
-	u32		     tx_avail;
 	struct skge_ring     tx_ring;
 	struct skge_ring     rx_ring;