diff options
Diffstat (limited to 'drivers/net/sb1250-mac.c')
-rw-r--r-- | drivers/net/sb1250-mac.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c index 9ab1618e82a4..e4c8896b76cb 100644 --- a/drivers/net/sb1250-mac.c +++ b/drivers/net/sb1250-mac.c | |||
@@ -2708,7 +2708,6 @@ static struct net_device_stats *sbmac_get_stats(struct net_device *dev) | |||
2708 | static void sbmac_set_rx_mode(struct net_device *dev) | 2708 | static void sbmac_set_rx_mode(struct net_device *dev) |
2709 | { | 2709 | { |
2710 | unsigned long flags; | 2710 | unsigned long flags; |
2711 | int msg_flag = 0; | ||
2712 | struct sbmac_softc *sc = netdev_priv(dev); | 2711 | struct sbmac_softc *sc = netdev_priv(dev); |
2713 | 2712 | ||
2714 | spin_lock_irqsave(&sc->sbm_lock, flags); | 2713 | spin_lock_irqsave(&sc->sbm_lock, flags); |
@@ -2718,22 +2717,14 @@ static void sbmac_set_rx_mode(struct net_device *dev) | |||
2718 | */ | 2717 | */ |
2719 | 2718 | ||
2720 | if (dev->flags & IFF_PROMISC) { | 2719 | if (dev->flags & IFF_PROMISC) { |
2721 | /* Unconditionally log net taps. */ | ||
2722 | msg_flag = 1; | ||
2723 | sbmac_promiscuous_mode(sc,1); | 2720 | sbmac_promiscuous_mode(sc,1); |
2724 | } | 2721 | } |
2725 | else { | 2722 | else { |
2726 | msg_flag = 2; | ||
2727 | sbmac_promiscuous_mode(sc,0); | 2723 | sbmac_promiscuous_mode(sc,0); |
2728 | } | 2724 | } |
2729 | } | 2725 | } |
2730 | spin_unlock_irqrestore(&sc->sbm_lock, flags); | 2726 | spin_unlock_irqrestore(&sc->sbm_lock, flags); |
2731 | 2727 | ||
2732 | if (msg_flag) { | ||
2733 | printk(KERN_NOTICE "%s: Promiscuous mode %sabled.\n", | ||
2734 | dev->name,(msg_flag==1)?"en":"dis"); | ||
2735 | } | ||
2736 | |||
2737 | /* | 2728 | /* |
2738 | * Program the multicasts. Do this every time. | 2729 | * Program the multicasts. Do this every time. |
2739 | */ | 2730 | */ |