Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 149765
b: refs/heads/master
c: ec4e0cf
h: refs/heads/master
i:
  149763: 8071653
v: v3
  • Loading branch information
Alexander Beregalov authored and David S. Miller committed Apr 16, 2009
1 parent 2ad1d93 commit a1a2bfd
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 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: 8c2c6be186097aafd8f8a17927203b457545cc69
refs/heads/master: ec4e0cff9b8c97f5d63c8f1bdf7f44fb65fa8e3b
23 changes: 15 additions & 8 deletions trunk/drivers/net/smc911x.c
Original file line number Diff line number Diff line change
Expand Up @@ -1774,6 +1774,20 @@ static int __devinit smc911x_findirq(struct net_device *dev)
return probe_irq_off(cookie);
}

static const struct net_device_ops smc911x_netdev_ops = {
.ndo_open = smc911x_open,
.ndo_stop = smc911x_close,
.ndo_start_xmit = smc911x_hard_start_xmit,
.ndo_tx_timeout = smc911x_timeout,
.ndo_set_multicast_list = smc911x_set_multicast_list,
.ndo_change_mtu = eth_change_mtu,
.ndo_validate_addr = eth_validate_addr,
.ndo_set_mac_address = eth_mac_addr,
#ifdef CONFIG_NET_POLL_CONTROLLER
.ndo_poll_controller = smc911x_poll_controller,
#endif
};

/*
* Function: smc911x_probe(unsigned long ioaddr)
*
Expand Down Expand Up @@ -1940,16 +1954,9 @@ static int __devinit smc911x_probe(struct net_device *dev)
/* Fill in the fields of the device structure with ethernet values. */
ether_setup(dev);

dev->open = smc911x_open;
dev->stop = smc911x_close;
dev->hard_start_xmit = smc911x_hard_start_xmit;
dev->tx_timeout = smc911x_timeout;
dev->netdev_ops = &smc911x_netdev_ops;
dev->watchdog_timeo = msecs_to_jiffies(watchdog);
dev->set_multicast_list = smc911x_set_multicast_list;
dev->ethtool_ops = &smc911x_ethtool_ops;
#ifdef CONFIG_NET_POLL_CONTROLLER
dev->poll_controller = smc911x_poll_controller;
#endif

INIT_WORK(&lp->phy_configure, smc911x_phy_configure);
lp->mii.phy_id_mask = 0x1f;
Expand Down

0 comments on commit a1a2bfd

Please sign in to comment.