diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-29 09:42:58 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-29 10:37:07 +0100 |
| commit | 0ce74d9296c971b2355c26984ad0bc538e34dd6c (patch) | |
| tree | 566d03e2a4f6b42dab9628cd82c93cd61d587467 /drivers/net/dummy.c | |
| parent | 1cc4fff0b360aeffeedb7d6db5089d88dd861700 (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
| download | kernel-crypto-0ce74d9296c971b2355c26984ad0bc538e34dd6c.tar.gz kernel-crypto-0ce74d9296c971b2355c26984ad0bc538e34dd6c.tar.xz kernel-crypto-0ce74d9296c971b2355c26984ad0bc538e34dd6c.zip | |
Merge branch 'linus' into timers/hrtimers
Conflicts:
sound/drivers/pcsp/pcsp.c
Semantic conflict:
sound/core/hrtimer.c
Diffstat (limited to 'drivers/net/dummy.c')
| -rw-r--r-- | drivers/net/dummy.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c index 84e14f397d9..8ebd7d78940 100644 --- a/drivers/net/dummy.c +++ b/drivers/net/dummy.c @@ -57,18 +57,23 @@ static void set_multicast_list(struct net_device *dev) { } +static const struct net_device_ops dummy_netdev_ops = { + .ndo_start_xmit = dummy_xmit, + .ndo_validate_addr = eth_validate_addr, + .ndo_set_multicast_list = set_multicast_list, + .ndo_set_mac_address = dummy_set_address, +}; + static void dummy_setup(struct net_device *dev) { + ether_setup(dev); + /* Initialize the device structure. */ - dev->hard_start_xmit = dummy_xmit; - dev->set_multicast_list = set_multicast_list; - dev->set_mac_address = dummy_set_address; + dev->netdev_ops = &dummy_netdev_ops; dev->destructor = free_netdev; /* Fill in device structure with ethernet-generic values. */ - ether_setup(dev); dev->tx_queue_len = 0; - dev->change_mtu = NULL; dev->flags |= IFF_NOARP; dev->flags &= ~IFF_MULTICAST; random_ether_addr(dev->dev_addr); |