diff --git a/[refs] b/[refs] index 83fe59d28529..0e1f2d046b6e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f2435e532bd64742c3f766b7d5c17cc9d0b8558 +refs/heads/master: f6d52432a4bc6da5de2a0bbb350f735db3206aa5 diff --git a/trunk/drivers/net/bnx2.h b/trunk/drivers/net/bnx2.h index 88f962bff2d3..900641ac63e0 100644 --- a/trunk/drivers/net/bnx2.h +++ b/trunk/drivers/net/bnx2.h @@ -6848,9 +6848,6 @@ struct bnx2 { u8 flow_ctrl; /* actual flow ctrl settings */ /* may be different from */ /* req_flow_ctrl if autoneg */ -#define FLOW_CTRL_TX 1 -#define FLOW_CTRL_RX 2 - u32 advertising; u8 req_flow_ctrl; /* flow ctrl advertisement */