---

yaml --- r: 291386 b: refs/heads/master c: 241fb5d h: refs/heads/master v: v3
git-mirror · Mar 13, 2012 · bf3e6c9 · bf3e6c9
1 parent 774e7df
commit bf3e6c9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 382984618e847ad4621d7ccbd48f5ec702c6a78e
+refs/heads/master: 241fb5d2b4205a523a50a85f9c312e1eda8ec53d
diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -1450,7 +1450,7 @@ static void bnx2x_get_pauseparam(struct net_device *dev,
 			   BNX2X_FLOW_CTRL_AUTO);
 
 	if (!epause->autoneg)
-		cfg_reg = bp->link_vars.flow_ctrl;
+		cfg_reg = bp->link_params.req_flow_ctrl[cfg_idx];
 	else
 		cfg_reg = bp->link_params.req_fc_auto_adv;