diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-12 11:45:33 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-12 11:45:33 -0400 |
| commit | 4e83b7fad8d3fd55828baa4510885c7362e66a26 (patch) | |
| tree | eb3f28516c05a945f2e9c8003e5864de4e0763bc /drivers/net/sis190.c | |
| parent | c925f1ea9ec20a95d46f57810f4a4d69db74580e (diff) | |
| parent | d5b20697ca37d80cc4ec2ba3c5ddf1339dc1d49a (diff) | |
Merge branch 'tmp' into upstream
Diffstat (limited to 'drivers/net/sis190.c')
| -rw-r--r-- | drivers/net/sis190.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c index 16e30d523fc5..7c1982af2a44 100644 --- a/drivers/net/sis190.c +++ b/drivers/net/sis190.c | |||
| @@ -821,9 +821,6 @@ static void sis190_set_rx_mode(struct net_device *dev) | |||
| 821 | u16 rx_mode; | 821 | u16 rx_mode; |
| 822 | 822 | ||
| 823 | if (dev->flags & IFF_PROMISC) { | 823 | if (dev->flags & IFF_PROMISC) { |
| 824 | /* Unconditionally log net taps. */ | ||
| 825 | net_drv(tp, KERN_NOTICE "%s: Promiscuous mode enabled.\n", | ||
| 826 | dev->name); | ||
| 827 | rx_mode = | 824 | rx_mode = |
| 828 | AcceptBroadcast | AcceptMulticast | AcceptMyPhys | | 825 | AcceptBroadcast | AcceptMulticast | AcceptMyPhys | |
| 829 | AcceptAllPhys; | 826 | AcceptAllPhys; |