diff options
Diffstat (limited to 'drivers/net/ioc3-eth.c')
-rw-r--r-- | drivers/net/ioc3-eth.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c index 65f897ddb920..87650237dc5c 100644 --- a/drivers/net/ioc3-eth.c +++ b/drivers/net/ioc3-eth.c | |||
@@ -28,7 +28,7 @@ | |||
28 | */ | 28 | */ |
29 | 29 | ||
30 | #define IOC3_NAME "ioc3-eth" | 30 | #define IOC3_NAME "ioc3-eth" |
31 | #define IOC3_VERSION "2.6.3-3" | 31 | #define IOC3_VERSION "2.6.3-4" |
32 | 32 | ||
33 | #include <linux/init.h> | 33 | #include <linux/init.h> |
34 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
@@ -115,7 +115,7 @@ static inline void ioc3_stop(struct ioc3_private *ip); | |||
115 | static void ioc3_init(struct net_device *dev); | 115 | static void ioc3_init(struct net_device *dev); |
116 | 116 | ||
117 | static const char ioc3_str[] = "IOC3 Ethernet"; | 117 | static const char ioc3_str[] = "IOC3 Ethernet"; |
118 | static struct ethtool_ops ioc3_ethtool_ops; | 118 | static const struct ethtool_ops ioc3_ethtool_ops; |
119 | 119 | ||
120 | /* We use this to acquire receive skb's that we can DMA directly into. */ | 120 | /* We use this to acquire receive skb's that we can DMA directly into. */ |
121 | 121 | ||
@@ -1580,7 +1580,7 @@ static u32 ioc3_get_link(struct net_device *dev) | |||
1580 | return rc; | 1580 | return rc; |
1581 | } | 1581 | } |
1582 | 1582 | ||
1583 | static struct ethtool_ops ioc3_ethtool_ops = { | 1583 | static const struct ethtool_ops ioc3_ethtool_ops = { |
1584 | .get_drvinfo = ioc3_get_drvinfo, | 1584 | .get_drvinfo = ioc3_get_drvinfo, |
1585 | .get_settings = ioc3_get_settings, | 1585 | .get_settings = ioc3_get_settings, |
1586 | .set_settings = ioc3_set_settings, | 1586 | .set_settings = ioc3_set_settings, |
@@ -1611,8 +1611,6 @@ static void ioc3_set_multicast_list(struct net_device *dev) | |||
1611 | netif_stop_queue(dev); /* Lock out others. */ | 1611 | netif_stop_queue(dev); /* Lock out others. */ |
1612 | 1612 | ||
1613 | if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ | 1613 | if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ |
1614 | /* Unconditionally log net taps. */ | ||
1615 | printk(KERN_INFO "%s: Promiscuous mode enabled.\n", dev->name); | ||
1616 | ip->emcr |= EMCR_PROMISC; | 1614 | ip->emcr |= EMCR_PROMISC; |
1617 | ioc3_w_emcr(ip->emcr); | 1615 | ioc3_w_emcr(ip->emcr); |
1618 | (void) ioc3_r_emcr(); | 1616 | (void) ioc3_r_emcr(); |