aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitris Michailidis <dm@chelsio.com>2010-06-18 10:05:32 +0000
committerDavid S. Miller <davem@davemloft.net>2010-06-18 22:08:37 -0700
commitf68707b805b7794bb7b208e327fbe0473c470d0b (patch)
treec9a109331e3077b9a047ea51af5d093b0913f9a7
parentcxgb4: switch to 64 bit inteface statistics (diff)
downloadlinux-dev-f68707b805b7794bb7b208e327fbe0473c470d0b.tar.xz
linux-dev-f68707b805b7794bb7b208e327fbe0473c470d0b.zip
cxgb4: propagate link initialization errors to .ndo_open's callers
Signed-off-by: Dimitris Michailidis <dm@chelsio.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/cxgb4/cxgb4_main.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/cxgb4/cxgb4_main.c b/drivers/net/cxgb4/cxgb4_main.c
index 6bfe7d65ef17..eb1492f4df2d 100644
--- a/drivers/net/cxgb4/cxgb4_main.c
+++ b/drivers/net/cxgb4/cxgb4_main.c
@@ -2512,9 +2512,10 @@ static int cxgb_open(struct net_device *dev)
}
dev->real_num_tx_queues = pi->nqsets;
- link_start(dev);
- netif_tx_start_all_queues(dev);
- return 0;
+ err = link_start(dev);
+ if (!err)
+ netif_tx_start_all_queues(dev);
+ return err;
}
static int cxgb_close(struct net_device *dev)