50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
From: Ajit Khaparde <ajit.khaparde@emulex.com>
|
|
Date: Thu, 26 Apr 2012 15:42:31 +0000
|
|
Subject: [PATCH 51/58] be2net: Ignore status of some ioctls during driver
|
|
load
|
|
|
|
commit ddc3f5cbaf1ddea122ec1d51c1cce97482b4d0c2 upstream.
|
|
|
|
Signed-off-by: Ajit Khaparde <ajit.khaparde@emulex.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/emulex/benet/be_main.c | 17 ++++-------------
|
|
1 file changed, 4 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
|
|
index 730fb1b..9effea4 100644
|
|
--- a/drivers/net/ethernet/emulex/benet/be_main.c
|
|
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
|
|
@@ -2696,24 +2696,15 @@ static int be_setup(struct be_adapter *adapter)
|
|
|
|
be_cmd_get_fw_ver(adapter, adapter->fw_ver, NULL);
|
|
|
|
- status = be_vid_config(adapter, false, 0);
|
|
- if (status)
|
|
- goto err;
|
|
+ be_vid_config(adapter, false, 0);
|
|
|
|
be_set_rx_mode(adapter->netdev);
|
|
|
|
- status = be_cmd_get_flow_control(adapter, &tx_fc, &rx_fc);
|
|
- /* For Lancer: It is legal for this cmd to fail on VF */
|
|
- if (status && (be_physfn(adapter) || !lancer_chip(adapter)))
|
|
- goto err;
|
|
+ be_cmd_get_flow_control(adapter, &tx_fc, &rx_fc);
|
|
|
|
- if (rx_fc != adapter->rx_fc || tx_fc != adapter->tx_fc) {
|
|
- status = be_cmd_set_flow_control(adapter, adapter->tx_fc,
|
|
+ if (rx_fc != adapter->rx_fc || tx_fc != adapter->tx_fc)
|
|
+ be_cmd_set_flow_control(adapter, adapter->tx_fc,
|
|
adapter->rx_fc);
|
|
- /* For Lancer: It is legal for this cmd to fail on VF */
|
|
- if (status && (be_physfn(adapter) || !lancer_chip(adapter)))
|
|
- goto err;
|
|
- }
|
|
|
|
pcie_set_readrq(adapter->pdev, 4096);
|
|
|
|
--
|
|
1.7.10
|
|
|