Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9fccec7 authored by Dmitry Kravkov's avatar Dmitry Kravkov Committed by David S. Miller
Browse files

bnx2x: use bnx2x_reload_if_running 



Signed-off-by: default avatarDmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: default avatarVladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@conan.davemloft.net>
parent 7a25cc73

drivers/net/bnx2x/bnx2x_cmn.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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);

	struct bnx2x *bp = netdev_priv(dev);

drivers/net/bnx2x/bnx2x_cmn.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -377,6 +377,9 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev); 
/* select_queue callback */

/* select_queue callback */

u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb);

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);

int bnx2x_change_mac_addr(struct net_device *dev, void *p);





/* NAPI poll Rx part */

/* NAPI poll Rx part */

drivers/net/bnx2x/bnx2x_ethtool.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -1238,7 +1238,6 @@ static int bnx2x_set_ringparam(struct net_device *dev, 
			       struct ethtool_ringparam *ering)

			       struct ethtool_ringparam *ering)

{

{

	struct bnx2x *bp = netdev_priv(dev);

	struct bnx2x *bp = netdev_priv(dev);

	int rc = 0;





	if (bp->recovery_state != BNX2X_RECOVERY_DONE) {

	if (bp->recovery_state != BNX2X_RECOVERY_DONE) {

		printk(KERN_ERR "Handling parity error recovery. Try again later\n");

		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->rx_ring_size = ering->rx_pending;

	bp->tx_ring_size = ering->tx_pending;

	bp->tx_ring_size = ering->tx_pending;





	if (netif_running(dev)) {

	return bnx2x_reload_if_running(dev);

		bnx2x_nic_unload(bp, UNLOAD_NORMAL);

		rc = bnx2x_nic_load(bp, LOAD_NORMAL);

	}



	return rc;

}

}





static void bnx2x_get_pauseparam(struct net_device *dev,

static void bnx2x_get_pauseparam(struct net_device *dev,