X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Fbnx2.h;h=2377cc13bf61afc14d7598eaa93cf78a691204a7;hb=3ea9eed49346eb80f17f1c6539c47dc508be1173;hp=3aa0364942e294047096f544b1644430f6483bb5;hpb=877c357e7511395bc923ec9efc2e8b021a17ed79;p=linux-2.6

diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index 3aa0364942..2377cc13bf 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -6656,7 +6656,6 @@ struct bnx2 {
 	int			current_interval;
 	struct			timer_list timer;
 	struct work_struct	reset_task;
-	int			in_reset_task;
 
 	/* Used to synchronize phy accesses. */
 	spinlock_t		phy_lock;
@@ -6673,6 +6672,7 @@ struct bnx2 {
 #define BNX2_PHY_FLAG_DIS_EARLY_DAC		0x00000400
 #define BNX2_PHY_FLAG_REMOTE_PHY_CAP		0x00000800
 #define BNX2_PHY_FLAG_FORCED_DOWN		0x00001000
+#define BNX2_PHY_FLAG_NO_PARALLEL		0x00002000
 
 	u32			mii_bmcr;
 	u32			mii_bmsr;