Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 136095
b: refs/heads/master
c: 6d1ec78
h: refs/heads/master
i:
  136093: 9a37bed
  136091: 0295d3c
  136087: 6bd568f
  136079: 5cec965
  136063: eb4becd
v: v3
  • Loading branch information
Stephen Hemminger authored and David S. Miller committed Mar 27, 2009
1 parent 8301fdb commit dad818d
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: 15d23e7a9e02c8ecbbf9a855e626707ba839135a
refs/heads/master: 6d1ec7812d6350409ecfe7f6dded3a6c801b89d3
18 changes: 12 additions & 6 deletions trunk/drivers/net/eth16i.c
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,17 @@ struct net_device * __init eth16i_probe(int unit)
}
#endif

static const struct net_device_ops eth16i_netdev_ops = {
.ndo_open = eth16i_open,
.ndo_stop = eth16i_close,
.ndo_start_xmit = eth16i_tx,
.ndo_set_multicast_list = eth16i_multicast,
.ndo_tx_timeout = eth16i_timeout,
.ndo_change_mtu = eth_change_mtu,
.ndo_set_mac_address = eth_mac_addr,
.ndo_validate_addr = eth_validate_addr,
};

static int __init eth16i_probe1(struct net_device *dev, int ioaddr)
{
struct eth16i_local *lp = netdev_priv(dev);
Expand Down Expand Up @@ -549,12 +560,7 @@ static int __init eth16i_probe1(struct net_device *dev, int ioaddr)
BITCLR(ioaddr + CONFIG_REG_1, POWERUP);

/* Initialize the device structure */
memset(lp, 0, sizeof(struct eth16i_local));
dev->open = eth16i_open;
dev->stop = eth16i_close;
dev->hard_start_xmit = eth16i_tx;
dev->set_multicast_list = eth16i_multicast;
dev->tx_timeout = eth16i_timeout;
dev->netdev_ops = &eth16i_netdev_ops;
dev->watchdog_timeo = TX_TIMEOUT;
spin_lock_init(&lp->lock);

Expand Down

0 comments on commit dad818d

Please sign in to comment.