Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 143467
b: refs/heads/master
c: ad5a24e
h: refs/heads/master
i:
  143465: c650237
  143463: 37233c8
v: v3
  • Loading branch information
Alexander Beregalov authored and David S. Miller committed Apr 15, 2009
1 parent b079c69 commit 34d60c6
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: 149da651bf340b796576a078574fbb49ed09b7ae
refs/heads/master: ad5a24e0944e8a0869d1f685ce4ae739adf84a87
17 changes: 12 additions & 5 deletions trunk/drivers/net/declance.c
Original file line number Diff line number Diff line change
Expand Up @@ -1010,6 +1010,17 @@ static void lance_set_multicast_retry(unsigned long _opaque)
lance_set_multicast(dev);
}

static const struct net_device_ops lance_netdev_ops = {
.ndo_open = lance_open,
.ndo_stop = lance_close,
.ndo_start_xmit = lance_start_xmit,
.ndo_tx_timeout = lance_tx_timeout,
.ndo_set_multicast_list = lance_set_multicast,
.ndo_change_mtu = eth_change_mtu,
.ndo_validate_addr = eth_validate_addr,
.ndo_set_mac_address = eth_mac_addr,
};

static int __init dec_lance_probe(struct device *bdev, const int type)
{
static unsigned version_printed;
Expand Down Expand Up @@ -1223,12 +1234,8 @@ static int __init dec_lance_probe(struct device *bdev, const int type)

printk(", addr = %pM, irq = %d\n", dev->dev_addr, dev->irq);

dev->open = &lance_open;
dev->stop = &lance_close;
dev->hard_start_xmit = &lance_start_xmit;
dev->tx_timeout = &lance_tx_timeout;
dev->netdev_ops = &lance_netdev_ops;
dev->watchdog_timeo = 5*HZ;
dev->set_multicast_list = &lance_set_multicast;

/* lp->ll is the location of the registers for lance card */
lp->ll = ll;
Expand Down

0 comments on commit 34d60c6

Please sign in to comment.