Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 149759
b: refs/heads/master
c: cd732de
h: refs/heads/master
i:
  149757: 82d4198
  149755: 1326ea0
  149751: 6716abf
  149743: 4313801
  149727: bb8dcf0
  149695: b230218
  149631: 4ba4dac
  149503: 95bf031
v: v3
  • Loading branch information
Alexander Beregalov authored and David S. Miller committed Apr 16, 2009
1 parent 846e561 commit 00c6ac3
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: 96cd55ea0edac7f6d51d2391d5cc1b5c2e360e67
refs/heads/master: cd732de21e3d4f0b905fdbee8abfbb8192144b3d
17 changes: 12 additions & 5 deletions trunk/drivers/net/netx-eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,17 @@ netx_eth_phy_write(struct net_device *ndev, int phy_id, int reg, int value)
while (readl(NETX_MIIMU) & MIIMU_SNRDY);
}

static const struct net_device_ops netx_eth_netdev_ops = {
.ndo_open = netx_eth_open,
.ndo_stop = netx_eth_close,
.ndo_start_xmit = netx_eth_hard_start_xmit,
.ndo_tx_timeout = netx_eth_timeout,
.ndo_set_multicast_list = netx_eth_set_multicast_list,
.ndo_change_mtu = eth_change_mtu,
.ndo_validate_addr = eth_validate_addr,
.ndo_set_mac_address = eth_mac_addr,
};

static int netx_eth_enable(struct net_device *ndev)
{
struct netx_eth_priv *priv = netdev_priv(ndev);
Expand All @@ -309,12 +320,8 @@ static int netx_eth_enable(struct net_device *ndev)

ether_setup(ndev);

ndev->open = netx_eth_open;
ndev->stop = netx_eth_close;
ndev->hard_start_xmit = netx_eth_hard_start_xmit;
ndev->tx_timeout = netx_eth_timeout;
ndev->netdev_ops = &netx_eth_netdev_ops;
ndev->watchdog_timeo = msecs_to_jiffies(5000);
ndev->set_multicast_list = netx_eth_set_multicast_list;

priv->msg_enable = NETIF_MSG_LINK;
priv->mii.phy_id_mask = 0x1f;
Expand Down

0 comments on commit 00c6ac3

Please sign in to comment.