X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fskge.h;h=86467ae74d455582a18b7e13f96e7fdd000c7087;hb=9cbe330f1fbbc8de15a5914aa6e91d89eb9daac4;hp=e9354dfa7e9af0ee0b2ad78f5c9604627ee96dd8;hpb=4ebabfcb1d6af5191ef5c8305717ccbc24979f6c;p=powerpc.git

diff --git a/drivers/net/skge.h b/drivers/net/skge.h
index e9354dfa7e..86467ae74d 100644
--- a/drivers/net/skge.h
+++ b/drivers/net/skge.h
@@ -2424,8 +2424,8 @@ struct skge_hw {
 	u32	     	     ram_size;
 	u32	     	     ram_offset;
 	u16		     phy_addr;
-	struct work_struct   phy_work;
-	struct mutex	     phy_mutex;
+	spinlock_t	     phy_lock;
+	struct tasklet_struct phy_task;
 };
 
 enum pause_control {
@@ -2457,7 +2457,7 @@ struct skge_port {
 
 	struct net_device_stats net_stats;
 
-	struct delayed_work  link_thread;
+	struct timer_list    link_timer;
 	enum pause_control   flow_control;
 	enum pause_status    flow_status;
 	u8		     rx_csum;