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/loopback.c | |
| parent | 1694176a210189312e31b083bac1e1688981219a (diff) | |
| parent | a68aa1cc6f3203b8a332683ebde67a00f39eec43 (diff) | |
| download | kernel_samsung_aries-02b25fcff676125a88169c8a78d4c6dd647574ed.zip kernel_samsung_aries-02b25fcff676125a88169c8a78d4c6dd647574ed.tar.gz kernel_samsung_aries-02b25fcff676125a88169c8a78d4c6dd647574ed.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/loopback.c')
| -rw-r--r-- | drivers/net/loopback.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index 997cbce..f429b19 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c @@ -181,7 +181,7 @@ static struct net_device_stats *get_stats(struct net_device *dev) stats->rx_packets += lb_stats->rx_packets; stats->tx_packets += lb_stats->tx_packets; } - + return stats; } @@ -190,7 +190,7 @@ static u32 loopback_get_link(struct net_device *dev) return 1; } -static struct ethtool_ops loopback_ethtool_ops = { +static const struct ethtool_ops loopback_ethtool_ops = { .get_link = loopback_get_link, .get_tso = ethtool_op_get_tso, .set_tso = ethtool_op_set_tso, @@ -230,7 +230,7 @@ int __init loopback_init(void) loopback_dev.priv = stats; loopback_dev.get_stats = &get_stats; } - + return register_netdev(&loopback_dev); }; |