Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 149741
b: refs/heads/master
c: 7a4762a
h: refs/heads/master
i:
  149739: 4ad8904
v: v3
  • Loading branch information
Alexander Beregalov authored and David S. Miller committed Apr 16, 2009
1 parent 04d824a commit b95895a
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: eb9bdaee550e4a56592ae12171b0be6de8fc9d17
refs/heads/master: 7a4762abf20531fc8d0bdbe132bc63181b8bebe8
16 changes: 11 additions & 5 deletions trunk/drivers/net/bmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -1247,6 +1247,16 @@ static const struct ethtool_ops bmac_ethtool_ops = {
.get_link = ethtool_op_get_link,
};

static const struct net_device_ops bmac_netdev_ops = {
.ndo_open = bmac_open,
.ndo_stop = bmac_close,
.ndo_start_xmit = bmac_output,
.ndo_set_multicast_list = bmac_set_multicast,
.ndo_set_mac_address = bmac_set_address,
.ndo_change_mtu = eth_change_mtu,
.ndo_validate_addr = eth_validate_addr,
};

static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_id *match)
{
int j, rev, ret;
Expand Down Expand Up @@ -1308,12 +1318,8 @@ static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_i
bmac_enable_and_reset_chip(dev);
bmwrite(dev, INTDISABLE, DisableAll);

dev->open = bmac_open;
dev->stop = bmac_close;
dev->netdev_ops = &bmac_netdev_ops;
dev->ethtool_ops = &bmac_ethtool_ops;
dev->hard_start_xmit = bmac_output;
dev->set_multicast_list = bmac_set_multicast;
dev->set_mac_address = bmac_set_address;

bmac_get_station_address(dev, addr);
if (bmac_verify_checksum(dev) != 0)
Expand Down

0 comments on commit b95895a

Please sign in to comment.