From: Ondrej Zary <linux@rainbow-software.org>
To: Samuel Chessman <chessman@tux.org>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 06/11] tlan: Don't scream if no link
Date: Sat, 21 Jun 2014 16:47:51 +0200 [thread overview]
Message-ID: <1403362076-7777-7-git-send-email-linux@rainbow-software.org> (raw)
In-Reply-To: <1403362076-7777-1-git-send-email-linux@rainbow-software.org>
Remove excess printks when the link is down.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
---
drivers/net/ethernet/ti/tlan.c | 9 ---------
drivers/net/ethernet/ti/tlan.h | 1 -
2 files changed, 10 deletions(-)
diff --git a/drivers/net/ethernet/ti/tlan.c b/drivers/net/ethernet/ti/tlan.c
index 47eb30e..6d9898f 100644
--- a/drivers/net/ethernet/ti/tlan.c
+++ b/drivers/net/ethernet/ti/tlan.c
@@ -1199,9 +1199,6 @@ static irqreturn_t tlan_handle_interrupt(int irq, void *dev_id)
static int tlan_close(struct net_device *dev)
{
- struct tlan_priv *priv = netdev_priv(dev);
-
- priv->neg_be_verbose = 0;
tlan_stop(dev);
free_irq(dev->irq, dev);
@@ -2702,12 +2699,6 @@ static void tlan_phy_finish_auto_neg(struct net_device *dev)
/* Wait for 8 sec to give the process
* more time. Perhaps we should fail after a while.
*/
- if (!priv->neg_be_verbose++) {
- pr_info("Giving autonegotiation more time.\n");
- pr_info("Please check that your adapter has\n");
- pr_info("been properly connected to a HUB or Switch.\n");
- pr_info("Trying to establish link in the background...\n");
- }
tlan_set_timer(dev, (8*HZ), TLAN_TIMER_PHY_FINISH_AN);
return;
}
diff --git a/drivers/net/ethernet/ti/tlan.h b/drivers/net/ethernet/ti/tlan.h
index b6ceeba..e992841 100644
--- a/drivers/net/ethernet/ti/tlan.h
+++ b/drivers/net/ethernet/ti/tlan.h
@@ -208,7 +208,6 @@ struct tlan_priv {
u8 tlan_full_duplex;
spinlock_t lock;
struct work_struct tlan_tqueue;
- u8 neg_be_verbose;
};
--
Ondrej Zary
next prev parent reply other threads:[~2014-06-21 14:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-21 14:47 [PATCH 0/11 v2] tlan: Link handling improvements and Olicom fixes Ondrej Zary
2014-06-21 14:47 ` [PATCH 01/11] tlan: Enable activity LED on Olicom OC-2325 and OC-2326 Ondrej Zary
2014-06-21 14:47 ` [PATCH 02/11] tlan: Enable link monitoring Ondrej Zary
2014-06-21 14:47 ` [PATCH 03/11] tlan: Add ethtool support Ondrej Zary
2014-06-21 14:47 ` [PATCH 04/11] tlan: Fix MAC address byte order on OC-2325/OC-2326 Ondrej Zary
2014-06-21 14:47 ` [PATCH 05/11] tlan: Restart autonegotiation on link loss Ondrej Zary
2014-06-21 17:06 ` Sergei Shtylyov
2014-06-21 14:47 ` Ondrej Zary [this message]
2014-06-21 14:47 ` [PATCH 07/11] tlan: Make autonegotiation faster Ondrej Zary
2014-06-21 14:47 ` [PATCH 08/11] tlan: Add PHY reset timeout Ondrej Zary
2014-06-21 14:47 ` [PATCH 09/11] tlan: Don't disable internal PHY on cards that use it in 10 Mbps mode Ondrej Zary
2014-06-21 14:47 ` [PATCH 10/11] tlan: Enable device at resume Ondrej Zary
2014-06-21 14:47 ` [PATCH 11/11] tlan: Isolate external PHY when using internal PHY Ondrej Zary
-- strict thread matches above, loose matches on Subject: below --
2014-06-30 16:38 [PATCH 0/11 v3] tlan: Link handling improvements and Olicom fixes Ondrej Zary
2014-06-30 16:38 ` [PATCH 06/11] tlan: Don't scream if no link Ondrej Zary
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=1403362076-7777-7-git-send-email-linux@rainbow-software.org \
--to=linux@rainbow-software.org \
--cc=chessman@tux.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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).