---

yaml --- r: 255535 b: refs/heads/master c: a9fccec h: refs/heads/master i: 255533: a89269a 255531: bb72f09 255527: d61252d 255519: 9b572b0 v: v3
git-mirror · Jun 15, 2011 · 6a35057 · 6a35057
1 parent 605bcd9
commit 6a35057
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a25cc7315e4d846cebbecd31bc4d79e7d2d6db3
+refs/heads/master: a9fccec79e359b9162ab0cebe2c7ce30ee4172c3
diff --git a/trunk/drivers/net/bnx2x/bnx2x_cmn.c b/trunk/drivers/net/bnx2x/bnx2x_cmn.c
@@ -2810,7 +2810,7 @@ int __devinit bnx2x_alloc_mem_bp(struct bnx2x *bp)
 
 }
 
-static int bnx2x_reload_if_running(struct net_device *dev)
+int bnx2x_reload_if_running(struct net_device *dev)
 {
 	struct bnx2x *bp = netdev_priv(dev);
 

diff --git a/trunk/drivers/net/bnx2x/bnx2x_cmn.h b/trunk/drivers/net/bnx2x/bnx2x_cmn.h
@@ -377,6 +377,9 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev);
 /* select_queue callback */
 u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb);
 
+/* reload helper */
+int bnx2x_reload_if_running(struct net_device *dev);
+
 int bnx2x_change_mac_addr(struct net_device *dev, void *p);
 
 /* NAPI poll Rx part */

diff --git a/trunk/drivers/net/bnx2x/bnx2x_ethtool.c b/trunk/drivers/net/bnx2x/bnx2x_ethtool.c
@@ -1238,7 +1238,6 @@ static int bnx2x_set_ringparam(struct net_device *dev,
 			       struct ethtool_ringparam *ering)
 {
 	struct bnx2x *bp = netdev_priv(dev);
-	int rc = 0;
 
 	if (bp->recovery_state != BNX2X_RECOVERY_DONE) {
 		printk(KERN_ERR "Handling parity error recovery. Try again later\n");
@@ -1255,12 +1254,7 @@ static int bnx2x_set_ringparam(struct net_device *dev,
 	bp->rx_ring_size = ering->rx_pending;
 	bp->tx_ring_size = ering->tx_pending;
 
-	if (netif_running(dev)) {
-		bnx2x_nic_unload(bp, UNLOAD_NORMAL);
-		rc = bnx2x_nic_load(bp, LOAD_NORMAL);
-	}
-
-	return rc;
+	return bnx2x_reload_if_running(dev);
 }
 
 static void bnx2x_get_pauseparam(struct net_device *dev,
-Original file line number
+Diff line change
@@ Expand Up / @@ -2810,7 +2810,7 @@ int __devinit bnx2x_alloc_mem_bp(struct bnx2x *bp) @@
     }
-    static int bnx2x_reload_if_running(struct net_device *dev)
+    int bnx2x_reload_if_running(struct net_device *dev)
     {
     	struct bnx2x *bp = netdev_priv(dev);
@@ Expand Down @@