Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 136093
b: refs/heads/master
c: 635d8ba
h: refs/heads/master
i:
  136091: 0295d3c
v: v3
  • Loading branch information
Stephen Hemminger authored and David S. Miller committed Mar 27, 2009
1 parent 7aba874 commit 9a37bed
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 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: 1494f2f5601b3220d55f1fdd8a6f990d41446c59
refs/heads/master: 635d8ba2ecb614b88ab16cb82c12cb344cab4427
17 changes: 12 additions & 5 deletions trunk/drivers/net/lp486e.c
Original file line number Diff line number Diff line change
Expand Up @@ -952,6 +952,17 @@ static void print_eth(char *add)
(unsigned char) add[12], (unsigned char) add[13]);
}

static const struct net_device_ops i596_netdev_ops = {
.ndo_open = i596_open,
.ndo_stop = i596_close,
.ndo_start_xmit = i596_start_xmit,
.ndo_set_multicast_list = set_multicast_list,
.ndo_tx_timeout = i596_tx_timeout,
.ndo_change_mtu = eth_change_mtu,
.ndo_set_mac_address = eth_mac_addr,
.ndo_validate_addr = eth_validate_addr,
};

static int __init lp486e_probe(struct net_device *dev) {
struct i596_private *lp;
unsigned char eth_addr[6] = { 0, 0xaa, 0, 0, 0, 0 };
Expand Down Expand Up @@ -1014,12 +1025,8 @@ static int __init lp486e_probe(struct net_device *dev) {
printk("\n");

/* The LP486E-specific entries in the device structure. */
dev->open = &i596_open;
dev->stop = &i596_close;
dev->hard_start_xmit = &i596_start_xmit;
dev->set_multicast_list = &set_multicast_list;
dev->netdev_ops = &i596_netdev_ops;
dev->watchdog_timeo = 5*HZ;
dev->tx_timeout = i596_tx_timeout;

#if 0
/* selftest reports 0x320925ae - don't know what that means */
Expand Down

0 comments on commit 9a37bed

Please sign in to comment.