diff options
| author | Chris Zankel <czankel@speedy.(none)> | 2010-08-03 00:38:00 -0700 |
|---|---|---|
| committer | Chris Zankel <czankel@speedy.(none)> | 2010-08-03 00:38:00 -0700 |
| commit | 66630f71e23a3b5fe778d38aea2f0c6d017602bf (patch) | |
| tree | 4aa52e15d68ce870fc8e7dbc140eeb16cd99ef79 /arch/xtensa/platforms/iss | |
| parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) | |
| parent | ecd53497b706b235a10c70d4fc639768d7235c5f (diff) | |
| download | kernel_samsung_tuna-66630f71e23a3b5fe778d38aea2f0c6d017602bf.zip kernel_samsung_tuna-66630f71e23a3b5fe778d38aea2f0c6d017602bf.tar.gz kernel_samsung_tuna-66630f71e23a3b5fe778d38aea2f0c6d017602bf.tar.bz2 | |
Merge remote branch 'origin/master'
Diffstat (limited to 'arch/xtensa/platforms/iss')
| -rw-r--r-- | arch/xtensa/platforms/iss/network.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/arch/xtensa/platforms/iss/network.c b/arch/xtensa/platforms/iss/network.c index 87e218f..f717e20 100644 --- a/arch/xtensa/platforms/iss/network.c +++ b/arch/xtensa/platforms/iss/network.c @@ -623,6 +623,19 @@ static struct platform_driver iss_net_driver = { static int driver_registered; +static const struct net_device_ops iss_netdev_ops = { + .ndo_open = iss_net_open, + .ndo_stop = iss_net_close, + .ndo_get_stats = iss_net_get_stats, + .ndo_start_xmit = iss_net_start_xmit, + .ndo_validate_addr = eth_validate_addr, + .ndo_change_mtu = iss_net_change_mtu, + .ndo_set_mac_address = iss_net_set_mac, + //.ndo_do_ioctl = iss_net_ioctl, + .ndo_tx_timeout = iss_net_tx_timeout, + .ndo_set_multicast_list = iss_net_set_multicast_list, +}; + static int iss_net_configure(int index, char *init) { struct net_device *dev; @@ -686,15 +699,8 @@ static int iss_net_configure(int index, char *init) */ snprintf(dev->name, sizeof dev->name, "eth%d", index); + dev->netdev_ops = &iss_netdev_ops; dev->mtu = lp->mtu; - dev->open = iss_net_open; - dev->hard_start_xmit = iss_net_start_xmit; - dev->stop = iss_net_close; - dev->get_stats = iss_net_get_stats; - dev->set_multicast_list = iss_net_set_multicast_list; - dev->tx_timeout = iss_net_tx_timeout; - dev->set_mac_address = iss_net_set_mac; - dev->change_mtu = iss_net_change_mtu; dev->watchdog_timeo = (HZ >> 1); dev->irq = -1; |