diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-09-24 22:05:59 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-09-24 22:05:59 +0100 |
| commit | 02b25fcff676125a88169c8a78d4c6dd647574ed (patch) | |
| tree | 372fc8e885be41ba1819b2767c8889ecd97ff948 /drivers/net/ucc_geth.c | |
| parent | 1694176a210189312e31b083bac1e1688981219a (diff) | |
| parent | a68aa1cc6f3203b8a332683ebde67a00f39eec43 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/ucc_geth.c')
| -rw-r--r-- | drivers/net/ucc_geth.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index 47f49ef72bd..700ebd7d145 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c @@ -47,7 +47,7 @@ #undef DEBUG -#define DRV_DESC "QE UCC Gigabit Ethernet Controller version:June 20, 2006" +#define DRV_DESC "QE UCC Gigabit Ethernet Controller version:Sept 11, 2006" #define DRV_NAME "ucc_geth" #define ugeth_printk(level, format, arg...) \ @@ -2510,8 +2510,6 @@ static void ucc_geth_set_multi(struct net_device *dev) if (dev->flags & IFF_PROMISC) { - /* Log any net taps. */ - printk("%s: Promiscuous mode enabled.\n", dev->name); uf_regs->upsmr |= UPSMR_PRO; } else { @@ -4131,20 +4129,7 @@ static int ucc_geth_close(struct net_device *dev) return 0; } -struct ethtool_ops ucc_geth_ethtool_ops = { - .get_settings = NULL, - .get_drvinfo = NULL, - .get_regs_len = NULL, - .get_regs = NULL, - .get_link = NULL, - .get_coalesce = NULL, - .set_coalesce = NULL, - .get_ringparam = NULL, - .set_ringparam = NULL, - .get_strings = NULL, - .get_stats_count = NULL, - .get_ethtool_stats = NULL, -}; +const struct ethtool_ops ucc_geth_ethtool_ops = { }; static int ucc_geth_probe(struct device *device) { |