Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 133799
b: refs/heads/master
c: e6c42b7
h: refs/heads/master
i:
  133797: 462029d
  133795: 36d4ef7
  133791: f493a68
v: v3
  • Loading branch information
Stephen Hemminger authored and David S. Miller committed Jan 21, 2009
1 parent e6dfc0f commit 77f048c
Show file tree
Hide file tree
Showing 2 changed files with 13 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: 878f64856d152ea4bab7dc3c279d0ee117901e1c
refs/heads/master: e6c42b782684cd582599d5c177516ee27d50deb8
18 changes: 12 additions & 6 deletions trunk/drivers/net/3c505.c
Original file line number Diff line number Diff line change
Expand Up @@ -1348,6 +1348,17 @@ static int __init elp_autodetect(struct net_device *dev)
return 0; /* Because of this, the layer above will return -ENODEV */
}

static const struct net_device_ops elp_netdev_ops = {
.ndo_open = elp_open,
.ndo_stop = elp_close,
.ndo_get_stats = elp_get_stats,
.ndo_start_xmit = elp_start_xmit,
.ndo_tx_timeout = elp_timeout,
.ndo_set_multicast_list = elp_set_mc_list,
.ndo_change_mtu = eth_change_mtu,
.ndo_set_mac_address = eth_mac_addr,
.ndo_validate_addr = eth_validate_addr,
};

/******************************************************
*
Expand Down Expand Up @@ -1552,13 +1563,8 @@ static int __init elplus_setup(struct net_device *dev)
printk(KERN_ERR "%s: adapter configuration failed\n", dev->name);
}

dev->open = elp_open; /* local */
dev->stop = elp_close; /* local */
dev->get_stats = elp_get_stats; /* local */
dev->hard_start_xmit = elp_start_xmit; /* local */
dev->tx_timeout = elp_timeout; /* local */
dev->netdev_ops = &elp_netdev_ops;
dev->watchdog_timeo = 10*HZ;
dev->set_multicast_list = elp_set_mc_list; /* local */
dev->ethtool_ops = &netdev_ethtool_ops; /* local */

dev->mem_start = dev->mem_end = 0;
Expand Down

0 comments on commit 77f048c

Please sign in to comment.