From 8916c02b47c5eb94076e8240c36f70ecc71d40ac Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Sat, 11 Feb 2012 15:12:10 +0000 Subject: [PATCH] ramips: raeth: make debugging messages configurable SVN-Revision: 30450 --- target/linux/ramips/files/drivers/net/ramips.c | 12 +++++++++--- .../linux/ramips/patches-2.6.39/103-ethernet.patch | 6 +++++- target/linux/ramips/rt288x/config-2.6.39 | 1 + target/linux/ramips/rt305x/config-2.6.39 | 1 + 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/target/linux/ramips/files/drivers/net/ramips.c b/target/linux/ramips/files/drivers/net/ramips.c index 1ec03b189d..5d9d9f3b48 100644 --- a/target/linux/ramips/files/drivers/net/ramips.c +++ b/target/linux/ramips/files/drivers/net/ramips.c @@ -40,6 +40,12 @@ static inline void rt305x_esw_exit(void) { } #define phys_to_bus(a) (a & 0x1FFFFFFF) +#ifdef CONFIG_RAMIPS_ETH_DEBUG +#define RADEBUG(fmt, args...) printk(KERN_DEBUG fmt, ## args) +#else +#define RADEBUG(fmt, args...) do {} while (0) +#endif + static struct net_device * ramips_dev; static void __iomem *ramips_fe_base = 0; @@ -443,7 +449,7 @@ ramips_eth_stop(struct net_device *dev) tasklet_kill(&priv->tx_housekeeping_tasklet); tasklet_kill(&priv->rx_tasklet); ramips_cleanup_dma(priv); - printk(KERN_DEBUG "ramips_eth: stopped\n"); + RADEBUG("ramips_eth: stopped\n"); return 0; } @@ -532,7 +538,7 @@ ramips_eth_plat_probe(struct platform_device *plat) goto err_free_dev; } - printk(KERN_DEBUG "ramips_eth: loaded\n"); + RADEBUG("ramips_eth: loaded\n"); return 0; err_free_dev: @@ -547,7 +553,7 @@ ramips_eth_plat_remove(struct platform_device *plat) { unregister_netdev(ramips_dev); free_netdev(ramips_dev); - printk(KERN_DEBUG "ramips_eth: unloaded\n"); + RADEBUG("ramips_eth: unloaded\n"); return 0; } diff --git a/target/linux/ramips/patches-2.6.39/103-ethernet.patch b/target/linux/ramips/patches-2.6.39/103-ethernet.patch index 2b02b49187..f6828cc13d 100644 --- a/target/linux/ramips/patches-2.6.39/103-ethernet.patch +++ b/target/linux/ramips/patches-2.6.39/103-ethernet.patch @@ -1,6 +1,6 @@ --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig -@@ -494,6 +494,12 @@ config MIPS_AU1X00_ENET +@@ -494,6 +494,16 @@ config MIPS_AU1X00_ENET If you have an Alchemy Semi AU1X00 based system say Y. Otherwise, say N. @@ -9,6 +9,10 @@ + depends on MIPS_RALINK + help + This driver supports the etehrnet mac inside the ralink wisocs ++ ++config RAMIPS_ETH_DEBUG ++ bool "Enable debug messages in the Ralink ethernet driver" ++ depends on MIPS_RAMIPS_NET + config SGI_IOC3_ETH bool "SGI IOC3 Ethernet" diff --git a/target/linux/ramips/rt288x/config-2.6.39 b/target/linux/ramips/rt288x/config-2.6.39 index 5ad60af3af..d57bba9ecb 100644 --- a/target/linux/ramips/rt288x/config-2.6.39 +++ b/target/linux/ramips/rt288x/config-2.6.39 @@ -91,6 +91,7 @@ CONFIG_RALINK_DEV_GPIO_BUTTONS=y CONFIG_RALINK_DEV_GPIO_LEDS=y CONFIG_RALINK_RT288X=y # CONFIG_RALINK_RT305X is not set +# CONFIG_RAMIPS_ETH_DEBUG is not set CONFIG_RAMIPS_WDT=y CONFIG_RT288X_MACH_F5D8235_V1=y CONFIG_RT288X_MACH_RT_N15=y diff --git a/target/linux/ramips/rt305x/config-2.6.39 b/target/linux/ramips/rt305x/config-2.6.39 index 0aa7670a8b..8842aa7faf 100644 --- a/target/linux/ramips/rt305x/config-2.6.39 +++ b/target/linux/ramips/rt305x/config-2.6.39 @@ -90,6 +90,7 @@ CONFIG_RALINK_DEV_GPIO_BUTTONS=y CONFIG_RALINK_DEV_GPIO_LEDS=y # CONFIG_RALINK_RT288X is not set CONFIG_RALINK_RT305X=y +# CONFIG_RAMIPS_ETH_DEBUG is not set CONFIG_RAMIPS_WDT=y CONFIG_RT305X_MACH_ALL0256N=y CONFIG_RT305X_MACH_ARGUS_ATP52B=y