netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Linus Walleij <linus.walleij@linaro.org>
To: netdev@vger.kernel.org, "David S . Miller" <davem@davemloft.net>
Cc: "Hans Ulli Kroll" <ulli.kroll@googlemail.com>,
	"Florian Fainelli" <f.fainelli@gmail.com>,
	"Michał Mirosław" <mirq-linux@rere.qmqm.pl>,
	"Andrew Lunn" <andrew@lunn.ch>,
	"Linus Walleij" <linus.walleij@linaro.org>
Subject: [PATCH net-next 3/5 v3] net: gemini: Allow multiple ports to instantiate
Date: Wed, 11 Jul 2018 21:32:43 +0200	[thread overview]
Message-ID: <20180711193245.21980-3-linus.walleij@linaro.org> (raw)
In-Reply-To: <20180711193245.21980-1-linus.walleij@linaro.org>

The code was not tested with two ports actually in use at
the same time. (I blame this on lack of actual hardware using
that feature.) Now after locating a system using both ports,
add necessary fix to make both ports come up.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ChangeLog v2->v3:
- No changes, just resending with the rest.
ChangeLog v1->v2:
- No changes, just resending with the rest.
---
 drivers/net/ethernet/cortina/gemini.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c
index f0ab6426daca..2457a1239d69 100644
--- a/drivers/net/ethernet/cortina/gemini.c
+++ b/drivers/net/ethernet/cortina/gemini.c
@@ -1789,7 +1789,10 @@ static int gmac_open(struct net_device *netdev)
 	phy_start(netdev->phydev);
 
 	err = geth_resize_freeq(port);
-	if (err) {
+	/* It's fine if it's just busy, the other port has set up
+	 * the freeq in that case.
+	 */
+	if (err && (err != -EBUSY)) {
 		netdev_err(netdev, "could not resize freeq\n");
 		goto err_stop_phy;
 	}
-- 
2.17.1

  parent reply	other threads:[~2018-07-11 19:42 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-11 19:32 [PATCH net-next 1/5 v3] net: gemini: Look up L3 maxlen from table Linus Walleij
2018-07-11 19:32 ` [PATCH net-next 2/5 v3] net: gemini: Improve connection prints Linus Walleij
2018-07-11 19:57   ` Andrew Lunn
2018-07-13  0:39   ` David Miller
2018-07-11 19:32 ` Linus Walleij [this message]
2018-07-13  0:39   ` [PATCH net-next 3/5 v3] net: gemini: Allow multiple ports to instantiate David Miller
2018-07-11 19:32 ` [PATCH net-next 4/5 v3] net: gemini: Move main init to port Linus Walleij
2018-07-13  0:39   ` David Miller
2018-07-11 19:32 ` [PATCH net-next 5/5 v3] net: gemini: Indicate that we can handle jumboframes Linus Walleij
2018-07-11 19:57   ` Andrew Lunn
2018-07-13  0:39   ` David Miller
2018-07-13  0:39 ` [PATCH net-next 1/5 v3] net: gemini: Look up L3 maxlen from table David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180711193245.21980-3-linus.walleij@linaro.org \
    --to=linus.walleij@linaro.org \
    --cc=andrew@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=f.fainelli@gmail.com \
    --cc=mirq-linux@rere.qmqm.pl \
    --cc=netdev@vger.kernel.org \
    --cc=ulli.kroll@googlemail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).