Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 133829
b: refs/heads/master
c: ba270ed
h: refs/heads/master
i:
  133827: 85e07f9
v: v3
  • Loading branch information
Stephen Hemminger authored and David S. Miller committed Jan 21, 2009
1 parent 806f46d commit 1d32491
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: 6095e08126790592699d8aeef4d31b263a4176a4
refs/heads/master: ba270ede101ad7439de7d4e92b71eece26db5c26
17 changes: 12 additions & 5 deletions trunk/drivers/net/82596.c
Original file line number Diff line number Diff line change
Expand Up @@ -1122,6 +1122,17 @@ static void print_eth(unsigned char *add, char *str)
static int io = 0x300;
static int irq = 10;

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,
};

struct net_device * __init i82596_probe(int unit)
{
struct net_device *dev;
Expand Down Expand Up @@ -1232,11 +1243,7 @@ struct net_device * __init i82596_probe(int unit)
DEB(DEB_PROBE,printk(KERN_INFO "%s", version));

/* The 82596-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->tx_timeout = i596_tx_timeout;
dev->netdev_ops = &i596_netdev_ops;
dev->watchdog_timeo = TX_TIMEOUT;

dev->ml_priv = (void *)(dev->mem_start);
Expand Down

0 comments on commit 1d32491

Please sign in to comment.