Commit d5b20697 authored by Andy Gospodarek's avatar Andy Gospodarek Committed by Jeff Garzik
Browse files

[PATCH] Remove more unnecessary driver printk's 



As I promised last week, here is the first pass at removing all
unnecessary printk's that exist in network device drivers currently in
promiscuous mode.  The duplicate messages are not needed so they have
been removed.  Some of these drivers are quite old and might not need an
update, but I did them all anyway.

I am currently auditing the remaining conditional printk's and will send
out a patch for those soon.

Signed-off-by: default avatarAndy Gospodarek <andy@greyhouse.net>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 05ff0e29

drivers/net/3c59x.c

+1 −1
Original line number Diff line number Diff line
@@ -2928,7 +2928,7 @@ static void set_rx_mode(struct net_device *dev) 
	int new_mode;



	if (dev->flags & IFF_PROMISC) {

		if (vortex_debug > 0)

		if (vortex_debug > 3)

			printk(KERN_NOTICE "%s: Setting promiscuous mode.\n", dev->name);

		new_mode = SetRxFilter|RxStation|RxMulticast|RxBroadcast|RxProm;

	} else	if ((dev->mc_list)  ||  (dev->flags & IFF_ALLMULTI)) {

drivers/net/8139cp.c

+1 −3
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
 */



#define DRV_NAME		"8139cp"

#define DRV_VERSION		"1.2"

#define DRV_VERSION		"1.3"

#define DRV_RELDATE		"Mar 22, 2004"
@@ -942,8 +942,6 @@ static void __cp_set_rx_mode (struct net_device *dev) 
	/* Note: do not reorder, GCC is clever about common statements. */

	if (dev->flags & IFF_PROMISC) {

		/* Unconditionally log net taps. */

		printk (KERN_NOTICE "%s: Promiscuous mode enabled.\n",

			dev->name);

		rx_mode =

		    AcceptBroadcast | AcceptMulticast | AcceptMyPhys |

		    AcceptAllPhys;

drivers/net/8139too.c

+1 −4
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ 
*/



#define DRV_NAME	"8139too"

#define DRV_VERSION	"0.9.27"

#define DRV_VERSION	"0.9.28"





#include <linux/module.h>
@@ -2512,9 +2512,6 @@ static void __set_rx_mode (struct net_device *dev) 


	/* Note: do not reorder, GCC is clever about common statements. */

	if (dev->flags & IFF_PROMISC) {

		/* Unconditionally log net taps. */

		printk (KERN_NOTICE "%s: Promiscuous mode enabled.\n",

			dev->name);

		rx_mode =

		    AcceptBroadcast | AcceptMulticast | AcceptMyPhys |

		    AcceptAllPhys;

drivers/net/amd8111e.c

+2 −3
Original line number Diff line number Diff line
@@ -101,9 +101,9 @@ Revision History: 


#include "amd8111e.h"

#define MODULE_NAME	"amd8111e"

#define MODULE_VERS	"3.0.5"

#define MODULE_VERS	"3.0.6"

MODULE_AUTHOR("Advanced Micro Devices, Inc.");

MODULE_DESCRIPTION ("AMD8111 based 10/100 Ethernet Controller. Driver Version 3.0.3");

MODULE_DESCRIPTION ("AMD8111 based 10/100 Ethernet Controller. Driver Version 3.0.6");

MODULE_LICENSE("GPL");

MODULE_DEVICE_TABLE(pci, amd8111e_pci_tbl);

module_param_array(speed_duplex, int, NULL, 0);
@@ -1527,7 +1527,6 @@ static void amd8111e_set_multicast_list(struct net_device *dev) 
	u32 mc_filter[2] ;

	int i,bit_num;

	if(dev->flags & IFF_PROMISC){

		printk(KERN_INFO "%s: Setting  promiscuous mode.\n",dev->name);

		writel( VAL2 | PROM, lp->mmio + CMD2);

		return;

	}

drivers/net/ariadne.c

+0 −2
Original line number Diff line number Diff line
@@ -825,8 +825,6 @@ static void set_multicast_list(struct net_device *dev) 
    ariadne_init_ring(dev);



    if (dev->flags & IFF_PROMISC) {

	/* Log any net taps. */

	printk(KERN_INFO "%s: Promiscuous mode enabled.\n", dev->name);

	lance->RAP = CSR15;		/* Mode Register */

	lance->RDP = PROM;		/* Set promiscuous mode */

    } else {

CRA Git | Maintained and supported by SUSTech CRA and CCSE