Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 122064
b: refs/heads/master
c: 2f30b1f
h: refs/heads/master
v: v3
  • Loading branch information
Stephen Hemminger authored and David S. Miller committed Nov 22, 2008
1 parent 40779b5 commit 6d1ece6
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 12 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: c3ecb9f3235ce6e39249690cdd24d678894c2c72
refs/heads/master: 2f30b1f666b8fa13eb7a254243066e6b77b583f7
27 changes: 16 additions & 11 deletions trunk/drivers/net/tehuti.c
Original file line number Diff line number Diff line change
Expand Up @@ -1885,6 +1885,21 @@ static void bdx_tx_push_desc_safe(struct bdx_priv *priv, void *data, int size)
RET();
}

static const struct net_device_ops bdx_netdev_ops = {
.ndo_open = bdx_open,
.ndo_stop = bdx_close,
.ndo_start_xmit = bdx_tx_transmit,
.ndo_validate_addr = eth_validate_addr,
.ndo_do_ioctl = bdx_ioctl,
.ndo_set_multicast_list = bdx_setmulti,
.ndo_get_stats = bdx_get_stats,
.ndo_change_mtu = bdx_change_mtu,
.ndo_set_mac_address = bdx_set_mac,
.ndo_vlan_rx_register = bdx_vlan_rx_register,
.ndo_vlan_rx_add_vid = bdx_vlan_rx_add_vid,
.ndo_vlan_rx_kill_vid = bdx_vlan_rx_kill_vid,
};

/**
* bdx_probe - Device Initialization Routine
* @pdev: PCI device information struct
Expand Down Expand Up @@ -1994,18 +2009,8 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
goto err_out_iomap;
}

ndev->open = bdx_open;
ndev->stop = bdx_close;
ndev->hard_start_xmit = bdx_tx_transmit;
ndev->do_ioctl = bdx_ioctl;
ndev->set_multicast_list = bdx_setmulti;
ndev->get_stats = bdx_get_stats;
ndev->change_mtu = bdx_change_mtu;
ndev->set_mac_address = bdx_set_mac;
ndev->netdev_ops = &bdx_netdev_ops;
ndev->tx_queue_len = BDX_NDEV_TXQ_LEN;
ndev->vlan_rx_register = bdx_vlan_rx_register;
ndev->vlan_rx_add_vid = bdx_vlan_rx_add_vid;
ndev->vlan_rx_kill_vid = bdx_vlan_rx_kill_vid;

bdx_ethtool_ops(ndev); /* ethtool interface */

Expand Down

0 comments on commit 6d1ece6

Please sign in to comment.