Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 149754
b: refs/heads/master
c: 488b4ab
h: refs/heads/master
v: v3
  • Loading branch information
Alexander Beregalov authored and David S. Miller committed Apr 16, 2009
1 parent 8289625 commit 4ec7184
Show file tree
Hide file tree
Showing 2 changed files with 12 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: 71f4367ca24830d967fca7a9c1cfb944b08742e5
refs/heads/master: 488b4abcd750c0a600eefa4d9ab42aad980ace11
16 changes: 11 additions & 5 deletions trunk/drivers/net/mace.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,16 @@ static void __mace_set_address(struct net_device *dev, void *addr);
*/
static unsigned char *dummy_buf;

static const struct net_device_ops mace_netdev_ops = {
.ndo_open = mace_open,
.ndo_stop = mace_close,
.ndo_start_xmit = mace_xmit_start,
.ndo_set_multicast_list = mace_set_multicast,
.ndo_set_mac_address = mace_set_address,
.ndo_change_mtu = eth_change_mtu,
.ndo_validate_addr = eth_validate_addr,
};

static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_id *match)
{
struct device_node *mace = macio_get_of_node(mdev);
Expand Down Expand Up @@ -207,11 +217,7 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i
}
}

dev->open = mace_open;
dev->stop = mace_close;
dev->hard_start_xmit = mace_xmit_start;
dev->set_multicast_list = mace_set_multicast;
dev->set_mac_address = mace_set_address;
dev->netdev_ops = &mace_netdev_ops;

/*
* Most of what is below could be moved to mace_open()
Expand Down

0 comments on commit 4ec7184

Please sign in to comment.