From f5647cbb9a5db21c8251719e6cee82de491255b4 Mon Sep 17 00:00:00 2001 From: Dimitris Michailidis Date: Fri, 18 Jun 2010 10:05:32 +0000 Subject: [PATCH] --- yaml --- r: 203101 b: refs/heads/master c: f68707b805b7794bb7b208e327fbe0473c470d0b h: refs/heads/master i: 203099: daa6ca98d9b1d60d571d7ea6882b8f85f7f02f15 v: v3 --- [refs] | 2 +- trunk/drivers/net/cxgb4/cxgb4_main.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f5f8e1399d73..0277c42d7cc6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9be793bfa38436f9142de219b6eef4d8dfa96606 +refs/heads/master: f68707b805b7794bb7b208e327fbe0473c470d0b diff --git a/trunk/drivers/net/cxgb4/cxgb4_main.c b/trunk/drivers/net/cxgb4/cxgb4_main.c index 6bfe7d65ef17..eb1492f4df2d 100644 --- a/trunk/drivers/net/cxgb4/cxgb4_main.c +++ b/trunk/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)