| 1 | --- a/Embedded/src/GbE/iegbe_main.c |
| 2 | +++ b/Embedded/src/GbE/iegbe_main.c |
| 3 | @@ -724,6 +724,26 @@ static void iegbe_dump_eeprom(struct ieg |
| 4 | kfree(data); |
| 5 | } |
| 6 | |
| 7 | +static const struct net_device_ops iegbe_netdev_ops = { |
| 8 | + .ndo_open = iegbe_open, |
| 9 | + .ndo_stop = iegbe_close, |
| 10 | + .ndo_start_xmit = iegbe_xmit_frame, |
| 11 | + .ndo_get_stats = iegbe_get_stats, |
| 12 | + .ndo_set_rx_mode = iegbe_set_rx_mode, |
| 13 | + .ndo_set_mac_address = iegbe_set_mac, |
| 14 | + .ndo_tx_timeout = iegbe_tx_timeout, |
| 15 | + .ndo_change_mtu = iegbe_change_mtu, |
| 16 | + .ndo_do_ioctl = iegbe_ioctl, |
| 17 | + .ndo_validate_addr = eth_validate_addr, |
| 18 | + |
| 19 | + .ndo_vlan_rx_register = iegbe_vlan_rx_register, |
| 20 | + .ndo_vlan_rx_add_vid = iegbe_vlan_rx_add_vid, |
| 21 | + .ndo_vlan_rx_kill_vid = iegbe_vlan_rx_kill_vid, |
| 22 | +#ifdef CONFIG_NET_POLL_CONTROLLER |
| 23 | + .ndo_poll_controller = iegbe_netpoll, |
| 24 | +#endif |
| 25 | +}; |
| 26 | + |
| 27 | /** |
| 28 | * iegbe_probe - Device Initialization Routine |
| 29 | * @pdev: PCI device information struct |
| 30 | @@ -800,24 +820,11 @@ static int __devinit iegbe_probe(struct |
| 31 | if (!hw->hw_addr) |
| 32 | goto err_ioremap; |
| 33 | |
| 34 | - netdev->open = &iegbe_open; |
| 35 | - netdev->stop = &iegbe_close; |
| 36 | - netdev->hard_start_xmit = &iegbe_xmit_frame; |
| 37 | - netdev->get_stats = &iegbe_get_stats; |
| 38 | - netdev->set_rx_mode = &iegbe_set_rx_mode; |
| 39 | - netdev->set_mac_address = &iegbe_set_mac; |
| 40 | - netdev->change_mtu = &iegbe_change_mtu; |
| 41 | - netdev->do_ioctl = &iegbe_ioctl; |
| 42 | + netdev->netdev_ops = &iegbe_netdev_ops; |
| 43 | set_ethtool_ops(netdev); |
| 44 | - netdev->tx_timeout = &iegbe_tx_timeout; |
| 45 | netdev->watchdog_timeo = 5 * HZ; |
| 46 | netif_napi_add(netdev, &adapter->napi, iegbe_clean, 64); |
| 47 | - netdev->vlan_rx_register = iegbe_vlan_rx_register; |
| 48 | - netdev->vlan_rx_add_vid = iegbe_vlan_rx_add_vid; |
| 49 | - netdev->vlan_rx_kill_vid = iegbe_vlan_rx_kill_vid; |
| 50 | -#ifdef CONFIG_NET_POLL_CONTROLLER |
| 51 | - netdev->poll_controller = iegbe_netpoll; |
| 52 | -#endif |
| 53 | + |
| 54 | strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1); |
| 55 | |
| 56 | |
| 57 | |
