X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Fmacb.h;h=57b85acf0d1685d6a239e8ff9c9a3f0862c9dbf5;hb=fbe0825752dc34b505777fd59cde4a6ce832eb16;hp=b3bb2182edd1ce3f9cf1178f18169a51fba926cd;hpb=0cc8674f2be3078fb586add1900c7835c977f384;p=linux-2.6

diff --git a/drivers/net/macb.h b/drivers/net/macb.h
index b3bb2182ed..57b85acf0d 100644
--- a/drivers/net/macb.h
+++ b/drivers/net/macb.h
@@ -374,6 +374,7 @@ struct macb {
 	struct clk		*pclk;
 	struct clk		*hclk;
 	struct net_device	*dev;
+	struct napi_struct	napi;
 	struct net_device_stats	stats;
 	struct macb_stats	hw_stats;
 
@@ -383,11 +384,11 @@ struct macb {
 
 	unsigned int		rx_pending, tx_pending;
 
-	struct delayed_work	periodic_task;
-
-	struct mutex		mdio_mutex;
-	struct completion	mdio_complete;
-	struct mii_if_info	mii;
+	struct mii_bus		mii_bus;
+	struct phy_device	*phy_dev;
+	unsigned int 		link;
+	unsigned int 		speed;
+	unsigned int 		duplex;
 };
 
 #endif /* _MACB_H */