Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 149751
b: refs/heads/master
c: 502a326
h: refs/heads/master
i:
  149749: a7dc346
  149747: 6c41b9b
  149743: 4313801
v: v3
  • Loading branch information
Alexander Beregalov authored and David S. Miller committed Apr 16, 2009
1 parent c8a863a commit 6716abf
Show file tree
Hide file tree
Showing 2 changed files with 14 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: e7090e347ad8bce0de35f9fe2b95e22e4ae8fbab
refs/heads/master: 502a326f833927a84a8de29f5fb638aa9da15f4b
19 changes: 13 additions & 6 deletions trunk/drivers/net/jazzsonic.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,18 @@ static int jazzsonic_close(struct net_device* dev)
return err;
}

static const struct net_device_ops sonic_netdev_ops = {
.ndo_open = jazzsonic_open,
.ndo_stop = jazzsonic_close,
.ndo_start_xmit = sonic_send_packet,
.ndo_get_stats = sonic_get_stats,
.ndo_set_multicast_list = sonic_multicast_list,
.ndo_tx_timeout = sonic_tx_timeout,
.ndo_change_mtu = eth_change_mtu,
.ndo_validate_addr = eth_validate_addr,
.ndo_set_mac_address = eth_mac_addr,
};

static int __init sonic_probe1(struct net_device *dev)
{
static unsigned version_printed;
Expand Down Expand Up @@ -179,12 +191,7 @@ static int __init sonic_probe1(struct net_device *dev)
lp->rra_laddr = lp->rda_laddr + (SIZEOF_SONIC_RD * SONIC_NUM_RDS
* SONIC_BUS_SCALE(lp->dma_bitmode));

dev->open = jazzsonic_open;
dev->stop = jazzsonic_close;
dev->hard_start_xmit = sonic_send_packet;
dev->get_stats = sonic_get_stats;
dev->set_multicast_list = &sonic_multicast_list;
dev->tx_timeout = sonic_tx_timeout;
dev->netdev_ops = &sonic_netdev_ops;
dev->watchdog_timeo = TX_TIMEOUT;

/*
Expand Down

0 comments on commit 6716abf

Please sign in to comment.