From: Gabor Juhos <juhosg@openwrt.org>
Date: Sat, 10 Apr 2010 11:34:11 +0000 (+0000)
Subject: Generic: Clean up output of AR8216 driver.
X-Git-Tag: reboot~20292
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3491026cbb6f1ad55c8b4cc63f0c3548028ce2a4;p=openwrt%2Fstaging%2Flynxis.git

Generic: Clean up output of AR8216 driver.

This patch is rather a cosmetic patch. It fixes the following issues:

 * Demote the unknown device message to debug level to not spam
   the log.
 * Fix the version print of the unknown device message.
 * Output the 'attach' message only when attaching as switch driver,
   not when attaching as phy driver.
 * Correctly return NET_RX_DROP when dropping packets.

Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com>
Cc: bacfire@openwrt.org

SVN-Revision: 20773
---

diff --git a/target/linux/generic-2.6/files/drivers/net/phy/ar8216.c b/target/linux/generic-2.6/files/drivers/net/phy/ar8216.c
index a473e3b181..4ae61da233 100644
--- a/target/linux/generic-2.6/files/drivers/net/phy/ar8216.c
+++ b/target/linux/generic-2.6/files/drivers/net/phy/ar8216.c
@@ -145,10 +145,10 @@ ar8216_id_chip(struct ar8216_priv *priv)
 	case 0x1001:
 		return AR8316;
 	default:
-		printk(KERN_ERR
+		printk(KERN_DEBUG
 			"ar8216: Unknown Atheros device [ver=%d, rev=%d, phy_id=%04x%04x]\n",
-			(int)(val >> AR8216_CTRL_VERSION_S),
-			(int)(val & AR8216_CTRL_REVISION),
+			(int)(id >> AR8216_CTRL_VERSION_S),
+			(int)(id & AR8216_CTRL_REVISION),
 			priv->phy->bus->read(priv->phy->bus, priv->phy->addr, 2),
 			priv->phy->bus->read(priv->phy->bus, priv->phy->addr, 3));
 
@@ -297,7 +297,7 @@ recv:
 error:
 	/* no vlan? eat the packet! */
 	dev_kfree_skb_any(skb);
-	return 0;
+	return NET_RX_DROP;
 }
 
 static int
@@ -646,8 +646,10 @@ ar8216_config_init(struct phy_device *pdev)
 
 	priv->chip = ar8216_id_chip(priv);
 
-	printk(KERN_INFO "%s: AR%d PHY driver attached.\n",
-		pdev->attached_dev->name, priv->chip);
+	if (pdev->addr == 0)
+		printk(KERN_INFO "%s: AR%d switch driver attached.\n",
+			pdev->attached_dev->name, priv->chip);
+
 
 	if (pdev->addr != 0) {
 		if (priv->chip == AR8316) {