Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 136087
b: refs/heads/master
c: cb0c700
h: refs/heads/master
i:
  136085: 24d0c34
  136083: 297b071
  136079: 5cec965
v: v3
  • Loading branch information
Stephen Hemminger authored and David S. Miller committed Mar 27, 2009
1 parent 1ed3c61 commit 6bd568f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 8 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: 8afb1cebf5e7fde4a1bddacb559bda8526e64144
refs/heads/master: cb0c7005d2dd20499c0855bfcb05272a4d206d23
19 changes: 12 additions & 7 deletions trunk/drivers/net/at1700.c
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,17 @@ struct net_device * __init at1700_probe(int unit)
return ERR_PTR(err);
}

static const struct net_device_ops at1700_netdev_ops = {
.ndo_open = net_open,
.ndo_stop = net_close,
.ndo_start_xmit = net_send_packet,
.ndo_set_multicast_list = set_rx_mode,
.ndo_tx_timeout = net_tx_timeout,
.ndo_change_mtu = eth_change_mtu,
.ndo_set_mac_address = eth_mac_addr,
.ndo_validate_addr = eth_validate_addr,
};

/* The Fujitsu datasheet suggests that the NIC be probed for by checking its
"signature", the default bit pattern after a reset. This *doesn't* work --
there is no way to reset the bus interface without a complete power-cycle!
Expand Down Expand Up @@ -448,13 +459,7 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr)
if (net_debug)
printk(version);

memset(lp, 0, sizeof(struct net_local));

dev->open = net_open;
dev->stop = net_close;
dev->hard_start_xmit = net_send_packet;
dev->set_multicast_list = &set_rx_mode;
dev->tx_timeout = net_tx_timeout;
dev->netdev_ops = &at1700_netdev_ops;
dev->watchdog_timeo = TX_TIMEOUT;

spin_lock_init(&lp->lock);
Expand Down

0 comments on commit 6bd568f

Please sign in to comment.