Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 143425
b: refs/heads/master
c: 0b179e3
h: refs/heads/master
i:
  143423: c732cb3
v: v3
  • Loading branch information
Alexander Beregalov authored and David S. Miller committed Apr 11, 2009
1 parent e19d6cd commit 6cd92ae
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9aa7b30ce36f3bfa03b878296d55e0551682de15
refs/heads/master: 0b179e315ad61e8969b984a4ab4acc65e5ecb506
19 changes: 13 additions & 6 deletions trunk/drivers/net/arm/ether1.c
Original file line number Diff line number Diff line change
Expand Up @@ -991,6 +991,18 @@ static void __devinit ether1_banner(void)
printk(KERN_INFO "%s", version);
}

static const struct net_device_ops ether1_netdev_ops = {
.ndo_open = ether1_open,
.ndo_stop = ether1_close,
.ndo_start_xmit = ether1_sendpacket,
.ndo_get_stats = ether1_getstats,
.ndo_set_multicast_list = ether1_setmulticastlist,
.ndo_tx_timeout = ether1_timeout,
.ndo_validate_addr = eth_validate_addr,
.ndo_change_mtu = eth_change_mtu,
.ndo_set_mac_address = eth_mac_addr,
};

static int __devinit
ether1_probe(struct expansion_card *ec, const struct ecard_id *id)
{
Expand Down Expand Up @@ -1031,12 +1043,7 @@ ether1_probe(struct expansion_card *ec, const struct ecard_id *id)
goto free;
}

dev->open = ether1_open;
dev->stop = ether1_close;
dev->hard_start_xmit = ether1_sendpacket;
dev->get_stats = ether1_getstats;
dev->set_multicast_list = ether1_setmulticastlist;
dev->tx_timeout = ether1_timeout;
dev->netdev_ops = &ether1_netdev_ops;
dev->watchdog_timeo = 5 * HZ / 100;

ret = register_netdev(dev);
Expand Down

0 comments on commit 6cd92ae

Please sign in to comment.