Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: get rid of SET_ETHTOOL_OPS

net: get rid of SET_ETHTOOL_OPS

Dave Miller mentioned he'd like to see SET_ETHTOOL_OPS gone.
This does that.

Mostly done via coccinelle script:
@@
struct ethtool_ops *ops;
struct net_device *dev;
@@
- SET_ETHTOOL_OPS(dev, ops);
+ dev->ethtool_ops = ops;

Compile tested only, but I'd seriously wonder if this broke anything.

Suggested-by: Dave Miller <davem@davemloft.net>
Signed-off-by: Wilfried Klaebe <w-lkml@lebenslange-mailadresse.de>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Wilfried Klaebe and committed by
David S. Miller
7ad24ea4 0f49ff07

+118 -128
+1 -1
drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
··· 105 105 106 106 void ipoib_set_ethtool_ops(struct net_device *dev) 107 107 { 108 - SET_ETHTOOL_OPS(dev, &ipoib_ethtool_ops); 108 + dev->ethtool_ops = &ipoib_ethtool_ops; 109 109 }
+1 -1
drivers/net/ethernet/3com/3c509.c
··· 534 534 /* The EL3-specific entries in the device structure. */ 535 535 dev->netdev_ops = &netdev_ops; 536 536 dev->watchdog_timeo = TX_TIMEOUT; 537 - SET_ETHTOOL_OPS(dev, &ethtool_ops); 537 + dev->ethtool_ops = &ethtool_ops; 538 538 539 539 err = register_netdev(dev); 540 540 if (err) {
+1 -1
drivers/net/ethernet/3com/3c589_cs.c
··· 218 218 dev->netdev_ops = &el3_netdev_ops; 219 219 dev->watchdog_timeo = TX_TIMEOUT; 220 220 221 - SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops); 221 + dev->ethtool_ops = &netdev_ethtool_ops; 222 222 223 223 return tc589_config(link); 224 224 }
+1 -1
drivers/net/ethernet/3com/typhoon.c
··· 2435 2435 netif_napi_add(dev, &tp->napi, typhoon_poll, 16); 2436 2436 dev->watchdog_timeo = TX_TIMEOUT; 2437 2437 2438 - SET_ETHTOOL_OPS(dev, &typhoon_ethtool_ops); 2438 + dev->ethtool_ops = &typhoon_ethtool_ops; 2439 2439 2440 2440 /* We can handle scatter gather, up to 16 entries, and 2441 2441 * we can do IP checksumming (only version 4, doh...)
+1 -1
drivers/net/ethernet/adaptec/starfire.c
··· 784 784 785 785 dev->netdev_ops = &netdev_ops; 786 786 dev->watchdog_timeo = TX_TIMEOUT; 787 - SET_ETHTOOL_OPS(dev, &ethtool_ops); 787 + dev->ethtool_ops = &ethtool_ops; 788 788 789 789 netif_napi_add(dev, &np->napi, netdev_poll, max_interrupt_work); 790 790
+1 -1
drivers/net/ethernet/alteon/acenic.c
··· 476 476 dev->watchdog_timeo = 5*HZ; 477 477 478 478 dev->netdev_ops = &ace_netdev_ops; 479 - SET_ETHTOOL_OPS(dev, &ace_ethtool_ops); 479 + dev->ethtool_ops = &ace_ethtool_ops; 480 480 481 481 /* we only display this string ONCE */ 482 482 if (!boards_found)
+1 -1
drivers/net/ethernet/altera/altera_tse_ethtool.c
··· 237 237 238 238 void altera_tse_set_ethtool_ops(struct net_device *netdev) 239 239 { 240 - SET_ETHTOOL_OPS(netdev, &tse_ethtool_ops); 240 + netdev->ethtool_ops = &tse_ethtool_ops; 241 241 }
+1 -1
drivers/net/ethernet/amd/amd8111e.c
··· 1900 1900 1901 1901 /* Initialize driver entry points */ 1902 1902 dev->netdev_ops = &amd8111e_netdev_ops; 1903 - SET_ETHTOOL_OPS(dev, &ops); 1903 + dev->ethtool_ops = &ops; 1904 1904 dev->irq =pdev->irq; 1905 1905 dev->watchdog_timeo = AMD8111E_TX_TIMEOUT; 1906 1906 netif_napi_add(dev, &lp->napi, amd8111e_rx_poll, 32);
+1 -1
drivers/net/ethernet/amd/au1000_eth.c
··· 1229 1229 dev->base_addr = base->start; 1230 1230 dev->irq = irq; 1231 1231 dev->netdev_ops = &au1000_netdev_ops; 1232 - SET_ETHTOOL_OPS(dev, &au1000_ethtool_ops); 1232 + dev->ethtool_ops = &au1000_ethtool_ops; 1233 1233 dev->watchdog_timeo = ETH_TX_TIMEOUT; 1234 1234 1235 1235 /*
+1 -1
drivers/net/ethernet/amd/nmclan_cs.c
··· 457 457 lp->tx_free_frames=AM2150_MAX_TX_FRAMES; 458 458 459 459 dev->netdev_ops = &mace_netdev_ops; 460 - SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops); 460 + dev->ethtool_ops = &netdev_ethtool_ops; 461 461 dev->watchdog_timeo = TX_TIMEOUT; 462 462 463 463 return nmclan_config(link);
+1 -1
drivers/net/ethernet/atheros/alx/main.c
··· 1302 1302 } 1303 1303 1304 1304 netdev->netdev_ops = &alx_netdev_ops; 1305 - SET_ETHTOOL_OPS(netdev, &alx_ethtool_ops); 1305 + netdev->ethtool_ops = &alx_ethtool_ops; 1306 1306 netdev->irq = pdev->irq; 1307 1307 netdev->watchdog_timeo = ALX_WATCHDOG_TIME; 1308 1308
+1 -1
drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c
··· 305 305 306 306 void atl1c_set_ethtool_ops(struct net_device *netdev) 307 307 { 308 - SET_ETHTOOL_OPS(netdev, &atl1c_ethtool_ops); 308 + netdev->ethtool_ops = &atl1c_ethtool_ops; 309 309 }
+1 -1
drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c
··· 388 388 389 389 void atl1e_set_ethtool_ops(struct net_device *netdev) 390 390 { 391 - SET_ETHTOOL_OPS(netdev, &atl1e_ethtool_ops); 391 + netdev->ethtool_ops = &atl1e_ethtool_ops; 392 392 }
+1 -1
drivers/net/ethernet/atheros/atlx/atl2.c
··· 1396 1396 atl2_setup_pcicmd(pdev); 1397 1397 1398 1398 netdev->netdev_ops = &atl2_netdev_ops; 1399 - SET_ETHTOOL_OPS(netdev, &atl2_ethtool_ops); 1399 + netdev->ethtool_ops = &atl2_ethtool_ops; 1400 1400 netdev->watchdog_timeo = 5 * HZ; 1401 1401 strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1); 1402 1402
+1 -1
drivers/net/ethernet/broadcom/b44.c
··· 2380 2380 netif_napi_add(dev, &bp->napi, b44_poll, 64); 2381 2381 dev->watchdog_timeo = B44_TX_TIMEOUT; 2382 2382 dev->irq = sdev->irq; 2383 - SET_ETHTOOL_OPS(dev, &b44_ethtool_ops); 2383 + dev->ethtool_ops = &b44_ethtool_ops; 2384 2384 2385 2385 err = ssb_bus_powerup(sdev->bus, 0); 2386 2386 if (err) {
+2 -2
drivers/net/ethernet/broadcom/bcm63xx_enet.c
··· 1897 1897 dev->netdev_ops = &bcm_enet_ops; 1898 1898 netif_napi_add(dev, &priv->napi, bcm_enet_poll, 16); 1899 1899 1900 - SET_ETHTOOL_OPS(dev, &bcm_enet_ethtool_ops); 1900 + dev->ethtool_ops = &bcm_enet_ethtool_ops; 1901 1901 SET_NETDEV_DEV(dev, &pdev->dev); 1902 1902 1903 1903 ret = register_netdev(dev); ··· 2783 2783 /* register netdevice */ 2784 2784 dev->netdev_ops = &bcm_enetsw_ops; 2785 2785 netif_napi_add(dev, &priv->napi, bcm_enet_poll, 16); 2786 - SET_ETHTOOL_OPS(dev, &bcm_enetsw_ethtool_ops); 2786 + dev->ethtool_ops = &bcm_enetsw_ethtool_ops; 2787 2787 SET_NETDEV_DEV(dev, &pdev->dev); 2788 2788 2789 2789 spin_lock_init(&priv->enetsw_mdio_lock);
+1 -1
drivers/net/ethernet/broadcom/bcmsysport.c
··· 1540 1540 1541 1541 SET_NETDEV_DEV(dev, &pdev->dev); 1542 1542 dev_set_drvdata(&pdev->dev, dev); 1543 - SET_ETHTOOL_OPS(dev, &bcm_sysport_ethtool_ops); 1543 + dev->ethtool_ops = &bcm_sysport_ethtool_ops; 1544 1544 dev->netdev_ops = &bcm_sysport_netdev_ops; 1545 1545 netif_napi_add(dev, &priv->napi, bcm_sysport_poll, 64); 1546 1546
+1 -1
drivers/net/ethernet/broadcom/bgmac.c
··· 1436 1436 return -ENOMEM; 1437 1437 net_dev->netdev_ops = &bgmac_netdev_ops; 1438 1438 net_dev->irq = core->irq; 1439 - SET_ETHTOOL_OPS(net_dev, &bgmac_ethtool_ops); 1439 + net_dev->ethtool_ops = &bgmac_ethtool_ops; 1440 1440 bgmac = netdev_priv(net_dev); 1441 1441 bgmac->net_dev = net_dev; 1442 1442 bgmac->core = core;
+2 -4
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
··· 3506 3506 3507 3507 void bnx2x_set_ethtool_ops(struct bnx2x *bp, struct net_device *netdev) 3508 3508 { 3509 - if (IS_PF(bp)) 3510 - SET_ETHTOOL_OPS(netdev, &bnx2x_ethtool_ops); 3511 - else /* vf */ 3512 - SET_ETHTOOL_OPS(netdev, &bnx2x_vf_ethtool_ops); 3509 + netdev->ethtool_ops = (IS_PF(bp)) ? 3510 + &bnx2x_ethtool_ops : &bnx2x_vf_ethtool_ops; 3513 3511 }
+1 -1
drivers/net/ethernet/broadcom/genet/bcmgenet.c
··· 2481 2481 dev_set_drvdata(&pdev->dev, dev); 2482 2482 ether_addr_copy(dev->dev_addr, macaddr); 2483 2483 dev->watchdog_timeo = 2 * HZ; 2484 - SET_ETHTOOL_OPS(dev, &bcmgenet_ethtool_ops); 2484 + dev->ethtool_ops = &bcmgenet_ethtool_ops; 2485 2485 dev->netdev_ops = &bcmgenet_netdev_ops; 2486 2486 netif_napi_add(dev, &priv->napi, bcmgenet_poll, 64); 2487 2487
+1 -1
drivers/net/ethernet/brocade/bna/bnad_ethtool.c
··· 1137 1137 void 1138 1138 bnad_set_ethtool_ops(struct net_device *netdev) 1139 1139 { 1140 - SET_ETHTOOL_OPS(netdev, &bnad_ethtool_ops); 1140 + netdev->ethtool_ops = &bnad_ethtool_ops; 1141 1141 }
+1 -1
drivers/net/ethernet/calxeda/xgmac.c
··· 1737 1737 platform_set_drvdata(pdev, ndev); 1738 1738 ether_setup(ndev); 1739 1739 ndev->netdev_ops = &xgmac_netdev_ops; 1740 - SET_ETHTOOL_OPS(ndev, &xgmac_ethtool_ops); 1740 + ndev->ethtool_ops = &xgmac_ethtool_ops; 1741 1741 spin_lock_init(&priv->stats_lock); 1742 1742 INIT_WORK(&priv->tx_timeout_work, xgmac_tx_timeout_work); 1743 1743
+1 -1
drivers/net/ethernet/chelsio/cxgb/cxgb2.c
··· 1100 1100 1101 1101 netif_napi_add(netdev, &adapter->napi, t1_poll, 64); 1102 1102 1103 - SET_ETHTOOL_OPS(netdev, &t1_ethtool_ops); 1103 + netdev->ethtool_ops = &t1_ethtool_ops; 1104 1104 } 1105 1105 1106 1106 if (t1_init_sw_modules(adapter, bi) < 0) {
+1 -1
drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
··· 3291 3291 netdev->features |= NETIF_F_HIGHDMA; 3292 3292 3293 3293 netdev->netdev_ops = &cxgb_netdev_ops; 3294 - SET_ETHTOOL_OPS(netdev, &cxgb_ethtool_ops); 3294 + netdev->ethtool_ops = &cxgb_ethtool_ops; 3295 3295 } 3296 3296 3297 3297 pci_set_drvdata(pdev, adapter);
+1 -1
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
··· 6083 6083 netdev->priv_flags |= IFF_UNICAST_FLT; 6084 6084 6085 6085 netdev->netdev_ops = &cxgb4_netdev_ops; 6086 - SET_ETHTOOL_OPS(netdev, &cxgb_ethtool_ops); 6086 + netdev->ethtool_ops = &cxgb_ethtool_ops; 6087 6087 } 6088 6088 6089 6089 pci_set_drvdata(pdev, adapter);
+1 -1
drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
··· 2664 2664 netdev->priv_flags |= IFF_UNICAST_FLT; 2665 2665 2666 2666 netdev->netdev_ops = &cxgb4vf_netdev_ops; 2667 - SET_ETHTOOL_OPS(netdev, &cxgb4vf_ethtool_ops); 2667 + netdev->ethtool_ops = &cxgb4vf_ethtool_ops; 2668 2668 2669 2669 /* 2670 2670 * Initialize the hardware/software state for the port.
+1 -1
drivers/net/ethernet/cisco/enic/enic_ethtool.c
··· 253 253 254 254 void enic_set_ethtool_ops(struct net_device *netdev) 255 255 { 256 - SET_ETHTOOL_OPS(netdev, &enic_ethtool_ops); 256 + netdev->ethtool_ops = &enic_ethtool_ops; 257 257 }
+1 -1
drivers/net/ethernet/dec/tulip/tulip_core.c
··· 1703 1703 #ifdef CONFIG_TULIP_NAPI 1704 1704 netif_napi_add(dev, &tp->napi, tulip_poll, 16); 1705 1705 #endif 1706 - SET_ETHTOOL_OPS(dev, &ops); 1706 + dev->ethtool_ops = &ops; 1707 1707 1708 1708 if (register_netdev(dev)) 1709 1709 goto err_out_free_ring;
+1 -1
drivers/net/ethernet/dlink/dl2k.c
··· 227 227 } 228 228 dev->netdev_ops = &netdev_ops; 229 229 dev->watchdog_timeo = TX_TIMEOUT; 230 - SET_ETHTOOL_OPS(dev, &ethtool_ops); 230 + dev->ethtool_ops = &ethtool_ops; 231 231 #if 0 232 232 dev->features = NETIF_F_IP_CSUM; 233 233 #endif
+1 -1
drivers/net/ethernet/dlink/sundance.c
··· 577 577 578 578 /* The chip-specific entries in the device structure. */ 579 579 dev->netdev_ops = &netdev_ops; 580 - SET_ETHTOOL_OPS(dev, &ethtool_ops); 580 + dev->ethtool_ops = &ethtool_ops; 581 581 dev->watchdog_timeo = TX_TIMEOUT; 582 582 583 583 pci_set_drvdata(pdev, dev);
+1 -1
drivers/net/ethernet/emulex/benet/be_main.c
··· 4304 4304 4305 4305 netdev->netdev_ops = &be_netdev_ops; 4306 4306 4307 - SET_ETHTOOL_OPS(netdev, &be_ethtool_ops); 4307 + netdev->ethtool_ops = &be_ethtool_ops; 4308 4308 } 4309 4309 4310 4310 static void be_unmap_pci_bars(struct be_adapter *adapter)
+1 -1
drivers/net/ethernet/faraday/ftgmac100.c
··· 1210 1210 1211 1211 SET_NETDEV_DEV(netdev, &pdev->dev); 1212 1212 1213 - SET_ETHTOOL_OPS(netdev, &ftgmac100_ethtool_ops); 1213 + netdev->ethtool_ops = &ftgmac100_ethtool_ops; 1214 1214 netdev->netdev_ops = &ftgmac100_netdev_ops; 1215 1215 netdev->features = NETIF_F_IP_CSUM | NETIF_F_GRO; 1216 1216
+1 -1
drivers/net/ethernet/faraday/ftmac100.c
··· 1085 1085 } 1086 1086 1087 1087 SET_NETDEV_DEV(netdev, &pdev->dev); 1088 - SET_ETHTOOL_OPS(netdev, &ftmac100_ethtool_ops); 1088 + netdev->ethtool_ops = &ftmac100_ethtool_ops; 1089 1089 netdev->netdev_ops = &ftmac100_netdev_ops; 1090 1090 1091 1091 platform_set_drvdata(pdev, netdev);
+1 -1
drivers/net/ethernet/freescale/ucc_geth_ethtool.c
··· 417 417 418 418 void uec_set_ethtool_ops(struct net_device *netdev) 419 419 { 420 - SET_ETHTOOL_OPS(netdev, &uec_ethtool_ops); 420 + netdev->ethtool_ops = &uec_ethtool_ops; 421 421 }
+1 -1
drivers/net/ethernet/fujitsu/fmvj18x_cs.c
··· 256 256 dev->netdev_ops = &fjn_netdev_ops; 257 257 dev->watchdog_timeo = TX_TIMEOUT; 258 258 259 - SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops); 259 + dev->ethtool_ops = &netdev_ethtool_ops; 260 260 261 261 return fmvj18x_config(link); 262 262 } /* fmvj18x_attach */
+1 -1
drivers/net/ethernet/ibm/ehea/ehea_ethtool.c
··· 278 278 279 279 void ehea_set_ethtool_ops(struct net_device *netdev) 280 280 { 281 - SET_ETHTOOL_OPS(netdev, &ehea_ethtool_ops); 281 + netdev->ethtool_ops = &ehea_ethtool_ops; 282 282 }
+1 -1
drivers/net/ethernet/ibm/emac/core.c
··· 2879 2879 dev->commac.ops = &emac_commac_sg_ops; 2880 2880 } else 2881 2881 ndev->netdev_ops = &emac_netdev_ops; 2882 - SET_ETHTOOL_OPS(ndev, &emac_ethtool_ops); 2882 + ndev->ethtool_ops = &emac_ethtool_ops; 2883 2883 2884 2884 netif_carrier_off(ndev); 2885 2885
+1 -1
drivers/net/ethernet/icplus/ipg.c
··· 2245 2245 */ 2246 2246 dev->netdev_ops = &ipg_netdev_ops; 2247 2247 SET_NETDEV_DEV(dev, &pdev->dev); 2248 - SET_ETHTOOL_OPS(dev, &ipg_ethtool_ops); 2248 + dev->ethtool_ops = &ipg_ethtool_ops; 2249 2249 2250 2250 rc = pci_request_regions(pdev, DRV_NAME); 2251 2251 if (rc)
+1 -1
drivers/net/ethernet/intel/e100.c
··· 2854 2854 netdev->hw_features |= NETIF_F_RXALL; 2855 2855 2856 2856 netdev->netdev_ops = &e100_netdev_ops; 2857 - SET_ETHTOOL_OPS(netdev, &e100_ethtool_ops); 2857 + netdev->ethtool_ops = &e100_ethtool_ops; 2858 2858 netdev->watchdog_timeo = E100_WATCHDOG_PERIOD; 2859 2859 strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1); 2860 2860
+1 -1
drivers/net/ethernet/intel/e1000/e1000_ethtool.c
··· 1905 1905 1906 1906 void e1000_set_ethtool_ops(struct net_device *netdev) 1907 1907 { 1908 - SET_ETHTOOL_OPS(netdev, &e1000_ethtool_ops); 1908 + netdev->ethtool_ops = &e1000_ethtool_ops; 1909 1909 }
+1 -1
drivers/net/ethernet/intel/e1000e/ethtool.c
··· 2318 2318 2319 2319 void e1000e_set_ethtool_ops(struct net_device *netdev) 2320 2320 { 2321 - SET_ETHTOOL_OPS(netdev, &e1000_ethtool_ops); 2321 + netdev->ethtool_ops = &e1000_ethtool_ops; 2322 2322 }
+1 -1
drivers/net/ethernet/intel/i40e/i40e_ethtool.c
··· 1700 1700 1701 1701 void i40e_set_ethtool_ops(struct net_device *netdev) 1702 1702 { 1703 - SET_ETHTOOL_OPS(netdev, &i40e_ethtool_ops); 1703 + netdev->ethtool_ops = &i40e_ethtool_ops; 1704 1704 }
+1 -1
drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c
··· 705 705 **/ 706 706 void i40evf_set_ethtool_ops(struct net_device *netdev) 707 707 { 708 - SET_ETHTOOL_OPS(netdev, &i40evf_ethtool_ops); 708 + netdev->ethtool_ops = &i40evf_ethtool_ops; 709 709 }
+1 -1
drivers/net/ethernet/intel/igb/igb_ethtool.c
··· 3035 3035 3036 3036 void igb_set_ethtool_ops(struct net_device *netdev) 3037 3037 { 3038 - SET_ETHTOOL_OPS(netdev, &igb_ethtool_ops); 3038 + netdev->ethtool_ops = &igb_ethtool_ops; 3039 3039 }
+1 -1
drivers/net/ethernet/intel/igbvf/ethtool.c
··· 476 476 477 477 void igbvf_set_ethtool_ops(struct net_device *netdev) 478 478 { 479 - SET_ETHTOOL_OPS(netdev, &igbvf_ethtool_ops); 479 + netdev->ethtool_ops = &igbvf_ethtool_ops; 480 480 }
+1 -1
drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c
··· 656 656 657 657 void ixgb_set_ethtool_ops(struct net_device *netdev) 658 658 { 659 - SET_ETHTOOL_OPS(netdev, &ixgb_ethtool_ops); 659 + netdev->ethtool_ops = &ixgb_ethtool_ops; 660 660 }
+1 -1
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
··· 3099 3099 3100 3100 void ixgbe_set_ethtool_ops(struct net_device *netdev) 3101 3101 { 3102 - SET_ETHTOOL_OPS(netdev, &ixgbe_ethtool_ops); 3102 + netdev->ethtool_ops = &ixgbe_ethtool_ops; 3103 3103 }
+1 -1
drivers/net/ethernet/intel/ixgbevf/ethtool.c
··· 813 813 814 814 void ixgbevf_set_ethtool_ops(struct net_device *netdev) 815 815 { 816 - SET_ETHTOOL_OPS(netdev, &ixgbevf_ethtool_ops); 816 + netdev->ethtool_ops = &ixgbevf_ethtool_ops; 817 817 }
+1 -1
drivers/net/ethernet/marvell/mv643xx_eth.c
··· 2889 2889 if (err) 2890 2890 goto out; 2891 2891 2892 - SET_ETHTOOL_OPS(dev, &mv643xx_eth_ethtool_ops); 2892 + dev->ethtool_ops = &mv643xx_eth_ethtool_ops; 2893 2893 2894 2894 init_pscr(mp, pd->speed, pd->duplex); 2895 2895
+1 -1
drivers/net/ethernet/marvell/mvneta.c
··· 2813 2813 dev->watchdog_timeo = 5 * HZ; 2814 2814 dev->netdev_ops = &mvneta_netdev_ops; 2815 2815 2816 - SET_ETHTOOL_OPS(dev, &mvneta_eth_tool_ops); 2816 + dev->ethtool_ops = &mvneta_eth_tool_ops; 2817 2817 2818 2818 pp = netdev_priv(dev); 2819 2819
+1 -1
drivers/net/ethernet/marvell/pxa168_eth.c
··· 1488 1488 dev->netdev_ops = &pxa168_eth_netdev_ops; 1489 1489 dev->watchdog_timeo = 2 * HZ; 1490 1490 dev->base_addr = 0; 1491 - SET_ETHTOOL_OPS(dev, &pxa168_ethtool_ops); 1491 + dev->ethtool_ops = &pxa168_ethtool_ops; 1492 1492 1493 1493 INIT_WORK(&pep->tx_timeout_task, pxa168_eth_tx_timeout_task); 1494 1494
+1 -1
drivers/net/ethernet/marvell/sky2.c
··· 4760 4760 4761 4761 SET_NETDEV_DEV(dev, &hw->pdev->dev); 4762 4762 dev->irq = hw->pdev->irq; 4763 - SET_ETHTOOL_OPS(dev, &sky2_ethtool_ops); 4763 + dev->ethtool_ops = &sky2_ethtool_ops; 4764 4764 dev->watchdog_timeo = TX_WATCHDOG; 4765 4765 dev->netdev_ops = &sky2_netdev_ops[port]; 4766 4766
+1 -1
drivers/net/ethernet/mellanox/mlx4/en_netdev.c
··· 2539 2539 netif_set_real_num_tx_queues(dev, priv->tx_ring_num); 2540 2540 netif_set_real_num_rx_queues(dev, priv->rx_ring_num); 2541 2541 2542 - SET_ETHTOOL_OPS(dev, &mlx4_en_ethtool_ops); 2542 + dev->ethtool_ops = &mlx4_en_ethtool_ops; 2543 2543 2544 2544 /* 2545 2545 * Set driver features
+3 -3
drivers/net/ethernet/micrel/ks8695net.c
··· 1504 1504 if (ksp->phyiface_regs && ksp->link_irq == -1) { 1505 1505 ks8695_init_switch(ksp); 1506 1506 ksp->dtype = KS8695_DTYPE_LAN; 1507 - SET_ETHTOOL_OPS(ndev, &ks8695_ethtool_ops); 1507 + ndev->ethtool_ops = &ks8695_ethtool_ops; 1508 1508 } else if (ksp->phyiface_regs && ksp->link_irq != -1) { 1509 1509 ks8695_init_wan_phy(ksp); 1510 1510 ksp->dtype = KS8695_DTYPE_WAN; 1511 - SET_ETHTOOL_OPS(ndev, &ks8695_wan_ethtool_ops); 1511 + ndev->ethtool_ops = &ks8695_wan_ethtool_ops; 1512 1512 } else { 1513 1513 /* No initialisation since HPNA does not have a PHY */ 1514 1514 ksp->dtype = KS8695_DTYPE_HPNA; 1515 - SET_ETHTOOL_OPS(ndev, &ks8695_ethtool_ops); 1515 + ndev->ethtool_ops = &ks8695_ethtool_ops; 1516 1516 } 1517 1517 1518 1518 /* And bring up the net_device with the net core */
+1 -1
drivers/net/ethernet/micrel/ks8851.c
··· 1471 1471 1472 1472 skb_queue_head_init(&ks->txq); 1473 1473 1474 - SET_ETHTOOL_OPS(ndev, &ks8851_ethtool_ops); 1474 + ndev->ethtool_ops = &ks8851_ethtool_ops; 1475 1475 SET_NETDEV_DEV(ndev, &spi->dev); 1476 1476 1477 1477 spi_set_drvdata(spi, ks);
+1 -1
drivers/net/ethernet/micrel/ksz884x.c
··· 7106 7106 } 7107 7107 7108 7108 dev->netdev_ops = &netdev_ops; 7109 - SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops); 7109 + dev->ethtool_ops = &netdev_ethtool_ops; 7110 7110 if (register_netdev(dev)) 7111 7111 goto pcidev_init_reg_err; 7112 7112 port_set_power_saving(port, true);
+1 -1
drivers/net/ethernet/microchip/enc28j60.c
··· 1593 1593 dev->irq = spi->irq; 1594 1594 dev->netdev_ops = &enc28j60_netdev_ops; 1595 1595 dev->watchdog_timeo = TX_TIMEOUT; 1596 - SET_ETHTOOL_OPS(dev, &enc28j60_ethtool_ops); 1596 + dev->ethtool_ops = &enc28j60_ethtool_ops; 1597 1597 1598 1598 enc28j60_lowpower(priv, true); 1599 1599
+1 -1
drivers/net/ethernet/myricom/myri10ge/myri10ge.c
··· 4112 4112 setup_timer(&mgp->watchdog_timer, myri10ge_watchdog_timer, 4113 4113 (unsigned long)mgp); 4114 4114 4115 - SET_ETHTOOL_OPS(netdev, &myri10ge_ethtool_ops); 4115 + netdev->ethtool_ops = &myri10ge_ethtool_ops; 4116 4116 INIT_WORK(&mgp->watchdog_work, myri10ge_watchdog); 4117 4117 status = register_netdev(netdev); 4118 4118 if (status != 0) {
+1 -1
drivers/net/ethernet/natsemi/natsemi.c
··· 927 927 dev->netdev_ops = &natsemi_netdev_ops; 928 928 dev->watchdog_timeo = TX_TIMEOUT; 929 929 930 - SET_ETHTOOL_OPS(dev, &ethtool_ops); 930 + dev->ethtool_ops = &ethtool_ops; 931 931 932 932 if (mtu) 933 933 dev->mtu = mtu;
+1 -1
drivers/net/ethernet/natsemi/ns83820.c
··· 2030 2030 pci_dev->subsystem_vendor, pci_dev->subsystem_device); 2031 2031 2032 2032 ndev->netdev_ops = &netdev_ops; 2033 - SET_ETHTOOL_OPS(ndev, &ops); 2033 + ndev->ethtool_ops = &ops; 2034 2034 ndev->watchdog_timeo = 5 * HZ; 2035 2035 pci_set_drvdata(pci_dev, ndev); 2036 2036
+1 -1
drivers/net/ethernet/neterion/s2io.c
··· 7910 7910 7911 7911 /* Driver entry points */ 7912 7912 dev->netdev_ops = &s2io_netdev_ops; 7913 - SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops); 7913 + dev->ethtool_ops = &netdev_ethtool_ops; 7914 7914 dev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | 7915 7915 NETIF_F_TSO | NETIF_F_TSO6 | 7916 7916 NETIF_F_RXCSUM | NETIF_F_LRO;
+1 -1
drivers/net/ethernet/neterion/vxge/vxge-ethtool.c
··· 1128 1128 1129 1129 void vxge_initialize_ethtool_ops(struct net_device *ndev) 1130 1130 { 1131 - SET_ETHTOOL_OPS(ndev, &vxge_ethtool_ops); 1131 + ndev->ethtool_ops = &vxge_ethtool_ops; 1132 1132 }
+1 -1
drivers/net/ethernet/nvidia/forcedeth.c
··· 5766 5766 dev->netdev_ops = &nv_netdev_ops_optimized; 5767 5767 5768 5768 netif_napi_add(dev, &np->napi, nv_napi_poll, RX_WORK_PER_LOOP); 5769 - SET_ETHTOOL_OPS(dev, &ops); 5769 + dev->ethtool_ops = &ops; 5770 5770 dev->watchdog_timeo = NV_WATCHDOG_TIMEO; 5771 5771 5772 5772 pci_set_drvdata(pci_dev, dev);
+1 -1
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c
··· 508 508 509 509 void pch_gbe_set_ethtool_ops(struct net_device *netdev) 510 510 { 511 - SET_ETHTOOL_OPS(netdev, &pch_gbe_ethtool_ops); 511 + netdev->ethtool_ops = &pch_gbe_ethtool_ops; 512 512 }
+2 -4
drivers/net/ethernet/packetengines/hamachi.c
··· 724 724 725 725 /* The Hamachi-specific entries in the device structure. */ 726 726 dev->netdev_ops = &hamachi_netdev_ops; 727 - if (chip_tbl[hmp->chip_id].flags & CanHaveMII) 728 - SET_ETHTOOL_OPS(dev, &ethtool_ops); 729 - else 730 - SET_ETHTOOL_OPS(dev, &ethtool_ops_no_mii); 727 + dev->ethtool_ops = (chip_tbl[hmp->chip_id].flags & CanHaveMII) ? 728 + &ethtool_ops : &ethtool_ops_no_mii; 731 729 dev->watchdog_timeo = TX_TIMEOUT; 732 730 if (mtu) 733 731 dev->mtu = mtu;
+1 -1
drivers/net/ethernet/packetengines/yellowfin.c
··· 472 472 473 473 /* The Yellowfin-specific entries in the device structure. */ 474 474 dev->netdev_ops = &netdev_ops; 475 - SET_ETHTOOL_OPS(dev, &ethtool_ops); 475 + dev->ethtool_ops = &ethtool_ops; 476 476 dev->watchdog_timeo = TX_TIMEOUT; 477 477 478 478 if (mtu)
+1 -1
drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
··· 1373 1373 1374 1374 netxen_nic_change_mtu(netdev, netdev->mtu); 1375 1375 1376 - SET_ETHTOOL_OPS(netdev, &netxen_nic_ethtool_ops); 1376 + netdev->ethtool_ops = &netxen_nic_ethtool_ops; 1377 1377 1378 1378 netdev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO | 1379 1379 NETIF_F_RXCSUM;
+1 -1
drivers/net/ethernet/qlogic/qla3xxx.c
··· 3838 3838 3839 3839 /* Set driver entry points */ 3840 3840 ndev->netdev_ops = &ql3xxx_netdev_ops; 3841 - SET_ETHTOOL_OPS(ndev, &ql3xxx_ethtool_ops); 3841 + ndev->ethtool_ops = &ql3xxx_ethtool_ops; 3842 3842 ndev->watchdog_timeo = 5 * HZ; 3843 3843 3844 3844 netif_napi_add(ndev, &qdev->napi, ql_poll, 64);
+3 -5
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
··· 2265 2265 2266 2266 qlcnic_change_mtu(netdev, netdev->mtu); 2267 2267 2268 - if (qlcnic_sriov_vf_check(adapter)) 2269 - SET_ETHTOOL_OPS(netdev, &qlcnic_sriov_vf_ethtool_ops); 2270 - else 2271 - SET_ETHTOOL_OPS(netdev, &qlcnic_ethtool_ops); 2268 + netdev->ethtool_ops = (qlcnic_sriov_vf_check(adapter)) ? 2269 + &qlcnic_sriov_vf_ethtool_ops : &qlcnic_ethtool_ops; 2272 2270 2273 2271 netdev->features |= (NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_RXCSUM | 2274 2272 NETIF_F_IPV6_CSUM | NETIF_F_GRO | ··· 2680 2682 err_out_maintenance_mode: 2681 2683 set_bit(__QLCNIC_MAINTENANCE_MODE, &adapter->state); 2682 2684 netdev->netdev_ops = &qlcnic_netdev_failed_ops; 2683 - SET_ETHTOOL_OPS(netdev, &qlcnic_ethtool_failed_ops); 2685 + netdev->ethtool_ops = &qlcnic_ethtool_failed_ops; 2684 2686 ahw->port_type = QLCNIC_XGBE; 2685 2687 2686 2688 if (qlcnic_83xx_check(adapter))
+1 -1
drivers/net/ethernet/qlogic/qlge/qlge_main.c
··· 4770 4770 ndev->irq = pdev->irq; 4771 4771 4772 4772 ndev->netdev_ops = &qlge_netdev_ops; 4773 - SET_ETHTOOL_OPS(ndev, &qlge_ethtool_ops); 4773 + ndev->ethtool_ops = &qlge_ethtool_ops; 4774 4774 ndev->watchdog_timeo = 10 * HZ; 4775 4775 4776 4776 err = register_netdev(ndev);
+1 -1
drivers/net/ethernet/realtek/r8169.c
··· 7125 7125 for (i = 0; i < ETH_ALEN; i++) 7126 7126 dev->dev_addr[i] = RTL_R8(MAC0 + i); 7127 7127 7128 - SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops); 7128 + dev->ethtool_ops = &rtl8169_ethtool_ops; 7129 7129 dev->watchdog_timeo = RTL8169_TX_TIMEOUT; 7130 7130 7131 7131 netif_napi_add(dev, &tp->napi, rtl8169_poll, R8169_NAPI_WEIGHT);
+1 -1
drivers/net/ethernet/renesas/sh_eth.c
··· 2843 2843 ndev->netdev_ops = &sh_eth_netdev_ops_tsu; 2844 2844 else 2845 2845 ndev->netdev_ops = &sh_eth_netdev_ops; 2846 - SET_ETHTOOL_OPS(ndev, &sh_eth_ethtool_ops); 2846 + ndev->ethtool_ops = &sh_eth_ethtool_ops; 2847 2847 ndev->watchdog_timeo = TX_TIMEOUT; 2848 2848 2849 2849 /* debug message level */
+1 -1
drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c
··· 520 520 521 521 void sxgbe_set_ethtool_ops(struct net_device *netdev) 522 522 { 523 - SET_ETHTOOL_OPS(netdev, &sxgbe_ethtool_ops); 523 + netdev->ethtool_ops = &sxgbe_ethtool_ops; 524 524 }
+1 -1
drivers/net/ethernet/sfc/efx.c
··· 2248 2248 } else { 2249 2249 net_dev->netdev_ops = &efx_farch_netdev_ops; 2250 2250 } 2251 - SET_ETHTOOL_OPS(net_dev, &efx_ethtool_ops); 2251 + net_dev->ethtool_ops = &efx_ethtool_ops; 2252 2252 net_dev->gso_max_segs = EFX_TSO_MAX_SEGS; 2253 2253 2254 2254 rtnl_lock();
+1 -1
drivers/net/ethernet/sis/sis190.c
··· 1877 1877 1878 1878 dev->netdev_ops = &sis190_netdev_ops; 1879 1879 1880 - SET_ETHTOOL_OPS(dev, &sis190_ethtool_ops); 1880 + dev->ethtool_ops = &sis190_ethtool_ops; 1881 1881 dev->watchdog_timeo = SIS190_TX_TIMEOUT; 1882 1882 1883 1883 spin_lock_init(&tp->lock);
+1 -1
drivers/net/ethernet/smsc/smc91c92_cs.c
··· 318 318 319 319 /* The SMC91c92-specific entries in the device structure. */ 320 320 dev->netdev_ops = &smc_netdev_ops; 321 - SET_ETHTOOL_OPS(dev, &ethtool_ops); 321 + dev->ethtool_ops = &ethtool_ops; 322 322 dev->watchdog_timeo = TX_TIMEOUT; 323 323 324 324 smc->mii_if.dev = dev;
+1 -1
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
··· 784 784 785 785 void stmmac_set_ethtool_ops(struct net_device *netdev) 786 786 { 787 - SET_ETHTOOL_OPS(netdev, &stmmac_ethtool_ops); 787 + netdev->ethtool_ops = &stmmac_ethtool_ops; 788 788 }
+1 -1
drivers/net/ethernet/tehuti/tehuti.c
··· 2413 2413 .get_ethtool_stats = bdx_get_ethtool_stats, 2414 2414 }; 2415 2415 2416 - SET_ETHTOOL_OPS(netdev, &bdx_ethtool_ops); 2416 + netdev->ethtool_ops = &bdx_ethtool_ops; 2417 2417 } 2418 2418 2419 2419 /**
+2 -2
drivers/net/ethernet/ti/cpsw.c
··· 1998 1998 ndev->features |= NETIF_F_HW_VLAN_CTAG_FILTER; 1999 1999 2000 2000 ndev->netdev_ops = &cpsw_netdev_ops; 2001 - SET_ETHTOOL_OPS(ndev, &cpsw_ethtool_ops); 2001 + ndev->ethtool_ops = &cpsw_ethtool_ops; 2002 2002 netif_napi_add(ndev, &priv_sl2->napi, cpsw_poll, CPSW_POLL_WEIGHT); 2003 2003 2004 2004 /* register the network device */ ··· 2227 2227 ndev->features |= NETIF_F_HW_VLAN_CTAG_FILTER; 2228 2228 2229 2229 ndev->netdev_ops = &cpsw_netdev_ops; 2230 - SET_ETHTOOL_OPS(ndev, &cpsw_ethtool_ops); 2230 + ndev->ethtool_ops = &cpsw_ethtool_ops; 2231 2231 netif_napi_add(ndev, &priv->napi, cpsw_poll, CPSW_POLL_WEIGHT); 2232 2232 2233 2233 /* register the network device */
+1 -1
drivers/net/ethernet/ti/davinci_emac.c
··· 1980 1980 } 1981 1981 1982 1982 ndev->netdev_ops = &emac_netdev_ops; 1983 - SET_ETHTOOL_OPS(ndev, &ethtool_ops); 1983 + ndev->ethtool_ops = &ethtool_ops; 1984 1984 netif_napi_add(ndev, &priv->napi, emac_poll, EMAC_POLL_WEIGHT); 1985 1985 1986 1986 /* register the network device */
+1 -1
drivers/net/hyperv/netvsc_drv.c
··· 810 810 net->features = NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_SG | NETIF_F_RXCSUM | 811 811 NETIF_F_IP_CSUM | NETIF_F_TSO; 812 812 813 - SET_ETHTOOL_OPS(net, &ethtool_ops); 813 + net->ethtool_ops = &ethtool_ops; 814 814 SET_NETDEV_DEV(net, &dev->device); 815 815 816 816 /* Notify the netvsc driver of the new device */
+1 -1
drivers/net/ntb_netdev.c
··· 348 348 memcpy(ndev->dev_addr, ndev->perm_addr, ndev->addr_len); 349 349 350 350 ndev->netdev_ops = &ntb_netdev_ops; 351 - SET_ETHTOOL_OPS(ndev, &ntb_ethtool_ops); 351 + ndev->ethtool_ops = &ntb_ethtool_ops; 352 352 353 353 dev->qp = ntb_transport_create_queue(ndev, pdev, &ntb_netdev_handlers); 354 354 if (!dev->qp) {
+1 -1
drivers/net/rionet.c
··· 494 494 ndev->mtu = RIO_MAX_MSG_SIZE - 14; 495 495 ndev->features = NETIF_F_LLTX; 496 496 SET_NETDEV_DEV(ndev, &mport->dev); 497 - SET_ETHTOOL_OPS(ndev, &rionet_ethtool_ops); 497 + ndev->ethtool_ops = &rionet_ethtool_ops; 498 498 499 499 spin_lock_init(&rnet->lock); 500 500 spin_lock_init(&rnet->tx_lock);
+1 -1
drivers/net/usb/catc.c
··· 793 793 794 794 netdev->netdev_ops = &catc_netdev_ops; 795 795 netdev->watchdog_timeo = TX_TIMEOUT; 796 - SET_ETHTOOL_OPS(netdev, &ops); 796 + netdev->ethtool_ops = &ops; 797 797 798 798 catc->usbdev = usbdev; 799 799 catc->netdev = netdev;
+1 -1
drivers/net/usb/hso.c
··· 2425 2425 net->type = ARPHRD_NONE; 2426 2426 net->mtu = DEFAULT_MTU - 14; 2427 2427 net->tx_queue_len = 10; 2428 - SET_ETHTOOL_OPS(net, &ops); 2428 + net->ethtool_ops = &ops; 2429 2429 2430 2430 /* and initialize the semaphore */ 2431 2431 spin_lock_init(&hso_net->net_lock);
+1 -1
drivers/net/usb/ipheth.c
··· 524 524 usb_set_intfdata(intf, dev); 525 525 526 526 SET_NETDEV_DEV(netdev, &intf->dev); 527 - SET_ETHTOOL_OPS(netdev, &ops); 527 + netdev->ethtool_ops = &ops; 528 528 529 529 retval = register_netdev(netdev); 530 530 if (retval) {
+1 -1
drivers/net/usb/kaweth.c
··· 1171 1171 netdev->netdev_ops = &kaweth_netdev_ops; 1172 1172 netdev->watchdog_timeo = KAWETH_TX_TIMEOUT; 1173 1173 netdev->mtu = le16_to_cpu(kaweth->configuration.segment_size); 1174 - SET_ETHTOOL_OPS(netdev, &ops); 1174 + netdev->ethtool_ops = &ops; 1175 1175 1176 1176 /* kaweth is zeroed as part of alloc_netdev */ 1177 1177 INIT_DELAYED_WORK(&kaweth->lowmem_work, kaweth_resubmit_tl);
+1 -1
drivers/net/usb/pegasus.c
··· 1159 1159 1160 1160 net->watchdog_timeo = PEGASUS_TX_TIMEOUT; 1161 1161 net->netdev_ops = &pegasus_netdev_ops; 1162 - SET_ETHTOOL_OPS(net, &ops); 1162 + net->ethtool_ops = &ops; 1163 1163 pegasus->mii.dev = net; 1164 1164 pegasus->mii.mdio_read = mdio_read; 1165 1165 pegasus->mii.mdio_write = mdio_write;
+1 -1
drivers/net/usb/r8152.c
··· 3452 3452 NETIF_F_TSO | NETIF_F_FRAGLIST | 3453 3453 NETIF_F_IPV6_CSUM | NETIF_F_TSO6; 3454 3454 3455 - SET_ETHTOOL_OPS(netdev, &ops); 3455 + netdev->ethtool_ops = &ops; 3456 3456 netif_set_gso_max_size(netdev, RTL_LIMITED_TSO_SIZE); 3457 3457 3458 3458 tp->mii.dev = netdev;
+1 -1
drivers/net/usb/rtl8150.c
··· 878 878 dev->netdev = netdev; 879 879 netdev->netdev_ops = &rtl8150_netdev_ops; 880 880 netdev->watchdog_timeo = RTL8150_TX_TIMEOUT; 881 - SET_ETHTOOL_OPS(netdev, &ops); 881 + netdev->ethtool_ops = &ops; 882 882 dev->intr_interval = 100; /* 100ms */ 883 883 884 884 if (!alloc_all_urbs(dev)) {
+1 -1
drivers/net/virtio_net.c
··· 1646 1646 dev->netdev_ops = &virtnet_netdev; 1647 1647 dev->features = NETIF_F_HIGHDMA; 1648 1648 1649 - SET_ETHTOOL_OPS(dev, &virtnet_ethtool_ops); 1649 + dev->ethtool_ops = &virtnet_ethtool_ops; 1650 1650 SET_NETDEV_DEV(dev, &vdev->dev); 1651 1651 1652 1652 /* Do we support "hardware" checksums? */
+1 -1
drivers/net/vmxnet3/vmxnet3_ethtool.c
··· 635 635 636 636 void vmxnet3_set_ethtool_ops(struct net_device *netdev) 637 637 { 638 - SET_ETHTOOL_OPS(netdev, &vmxnet3_ethtool_ops); 638 + netdev->ethtool_ops = &vmxnet3_ethtool_ops; 639 639 }
+1 -1
drivers/net/vxlan.c
··· 2716 2716 return -EEXIST; 2717 2717 } 2718 2718 2719 - SET_ETHTOOL_OPS(dev, &vxlan_ethtool_ops); 2719 + dev->ethtool_ops = &vxlan_ethtool_ops; 2720 2720 2721 2721 /* create an fdb entry for a valid default destination */ 2722 2722 if (!vxlan_addr_any(&vxlan->default_dst.remote_ip)) {
+1 -1
drivers/net/wireless/hostap/hostap_main.c
··· 882 882 dev->mtu = local->mtu; 883 883 884 884 885 - SET_ETHTOOL_OPS(dev, &prism2_ethtool_ops); 885 + dev->ethtool_ops = &prism2_ethtool_ops; 886 886 887 887 } 888 888
+1 -1
drivers/net/xen-netback/interface.c
··· 386 386 NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | 387 387 NETIF_F_TSO | NETIF_F_TSO6; 388 388 dev->features = dev->hw_features | NETIF_F_RXCSUM; 389 - SET_ETHTOOL_OPS(dev, &xenvif_ethtool_ops); 389 + dev->ethtool_ops = &xenvif_ethtool_ops; 390 390 391 391 dev->tx_queue_len = XENVIF_QUEUE_LENGTH; 392 392
+1 -1
drivers/net/xen-netfront.c
··· 1332 1332 */ 1333 1333 netdev->features |= netdev->hw_features; 1334 1334 1335 - SET_ETHTOOL_OPS(netdev, &xennet_ethtool_ops); 1335 + netdev->ethtool_ops = &xennet_ethtool_ops; 1336 1336 SET_NETDEV_DEV(netdev, &dev->dev); 1337 1337 1338 1338 netif_set_gso_max_size(netdev, XEN_NETIF_MAX_TX_SIZE - MAX_TCP_HEADER);
+3 -4
drivers/s390/net/qeth_l2_main.c
··· 969 969 card->dev->watchdog_timeo = QETH_TX_TIMEOUT; 970 970 card->dev->mtu = card->info.initial_mtu; 971 971 card->dev->netdev_ops = &qeth_l2_netdev_ops; 972 - if (card->info.type != QETH_CARD_TYPE_OSN) 973 - SET_ETHTOOL_OPS(card->dev, &qeth_l2_ethtool_ops); 974 - else 975 - SET_ETHTOOL_OPS(card->dev, &qeth_l2_osn_ops); 972 + card->dev->ethtool_ops = 973 + (card->info.type != QETH_CARD_TYPE_OSN) ? 974 + &qeth_l2_ethtool_ops : &qeth_l2_osn_ops; 976 975 card->dev->features |= NETIF_F_HW_VLAN_CTAG_FILTER; 977 976 card->info.broadcast_capable = 1; 978 977 qeth_l2_request_initial_mac(card);
+1 -1
drivers/s390/net/qeth_l3_main.c
··· 3301 3301 card->dev->ml_priv = card; 3302 3302 card->dev->watchdog_timeo = QETH_TX_TIMEOUT; 3303 3303 card->dev->mtu = card->info.initial_mtu; 3304 - SET_ETHTOOL_OPS(card->dev, &qeth_l3_ethtool_ops); 3304 + card->dev->ethtool_ops = &qeth_l3_ethtool_ops; 3305 3305 card->dev->features |= NETIF_F_HW_VLAN_CTAG_TX | 3306 3306 NETIF_F_HW_VLAN_CTAG_RX | 3307 3307 NETIF_F_HW_VLAN_CTAG_FILTER;
+1 -1
drivers/staging/et131x/et131x.c
··· 4604 4604 netdev->netdev_ops = &et131x_netdev_ops; 4605 4605 4606 4606 SET_NETDEV_DEV(netdev, &pdev->dev); 4607 - SET_ETHTOOL_OPS(netdev, &et131x_ethtool_ops); 4607 + netdev->ethtool_ops = &et131x_ethtool_ops; 4608 4608 4609 4609 adapter = et131x_adapter_init(netdev, pdev); 4610 4610
+1 -1
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
··· 2249 2249 2250 2250 ft1000InitProc(dev); 2251 2251 ft1000_card_present = 1; 2252 - SET_ETHTOOL_OPS(dev, &ops); 2252 + dev->ethtool_ops = &ops; 2253 2253 printk(KERN_INFO "ft1000: %s: addr 0x%04lx irq %d, MAC addr %pM\n", 2254 2254 dev->name, dev->base_addr, dev->irq, dev->dev_addr); 2255 2255 return dev;
+1 -1
drivers/staging/netlogic/xlr_net.c
··· 1066 1066 xlr_set_rx_mode(ndev); 1067 1067 1068 1068 priv->num_rx_desc += MAX_NUM_DESC_SPILL; 1069 - SET_ETHTOOL_OPS(ndev, &xlr_ethtool_ops); 1069 + ndev->ethtool_ops = &xlr_ethtool_ops; 1070 1070 SET_NETDEV_DEV(ndev, &pdev->dev); 1071 1071 1072 1072 /* Common registers, do one time initialization */
+1 -1
drivers/staging/octeon/ethernet.c
··· 469 469 470 470 /* We do our own locking, Linux doesn't need to */ 471 471 dev->features |= NETIF_F_LLTX; 472 - SET_ETHTOOL_OPS(dev, &cvm_oct_ethtool_ops); 472 + dev->ethtool_ops = &cvm_oct_ethtool_ops; 473 473 474 474 cvm_oct_phy_setup_device(dev); 475 475 cvm_oct_set_mac_filter(dev);
+2 -2
drivers/usb/gadget/u_ether.c
··· 793 793 794 794 net->netdev_ops = &eth_netdev_ops; 795 795 796 - SET_ETHTOOL_OPS(net, &ops); 796 + net->ethtool_ops = &ops; 797 797 798 798 dev->gadget = g; 799 799 SET_NETDEV_DEV(net, &g->dev); ··· 850 850 851 851 net->netdev_ops = &eth_netdev_ops; 852 852 853 - SET_ETHTOOL_OPS(net, &ops); 853 + net->ethtool_ops = &ops; 854 854 SET_NETDEV_DEVTYPE(net, &gadget_type); 855 855 856 856 return net;
-3
include/linux/netdevice.h
··· 56 56 struct phy_device; 57 57 /* 802.11 specific */ 58 58 struct wireless_dev; 59 - /* source back-compat hooks */ 60 - #define SET_ETHTOOL_OPS(netdev,ops) \ 61 - ( (netdev)->ethtool_ops = (ops) ) 62 59 63 60 void netdev_set_default_ethtool_ops(struct net_device *dev, 64 61 const struct ethtool_ops *ops);
+1 -1
net/batman-adv/soft-interface.c
··· 884 884 /* generate random address */ 885 885 eth_hw_addr_random(dev); 886 886 887 - SET_ETHTOOL_OPS(dev, &batadv_ethtool_ops); 887 + dev->ethtool_ops = &batadv_ethtool_ops; 888 888 889 889 memset(priv, 0, sizeof(*priv)); 890 890 }
+1 -1
net/bridge/br_device.c
··· 348 348 349 349 dev->netdev_ops = &br_netdev_ops; 350 350 dev->destructor = br_dev_free; 351 - SET_ETHTOOL_OPS(dev, &br_ethtool_ops); 351 + dev->ethtool_ops = &br_ethtool_ops; 352 352 SET_NETDEV_DEVTYPE(dev, &br_type); 353 353 dev->tx_queue_len = 0; 354 354 dev->priv_flags = IFF_EBRIDGE;
+1 -1
net/dsa/slave.c
··· 346 346 return slave_dev; 347 347 348 348 slave_dev->features = master->vlan_features; 349 - SET_ETHTOOL_OPS(slave_dev, &dsa_slave_ethtool_ops); 349 + slave_dev->ethtool_ops = &dsa_slave_ethtool_ops; 350 350 eth_hw_addr_inherit(slave_dev, master); 351 351 slave_dev->tx_queue_len = 0; 352 352
+1 -1
net/openvswitch/vport-internal_dev.c
··· 130 130 netdev->priv_flags &= ~IFF_TX_SKB_SHARING; 131 131 netdev->priv_flags |= IFF_LIVE_ADDR_CHANGE; 132 132 netdev->destructor = internal_dev_destructor; 133 - SET_ETHTOOL_OPS(netdev, &internal_dev_ethtool_ops); 133 + netdev->ethtool_ops = &internal_dev_ethtool_ops; 134 134 netdev->tx_queue_len = 0; 135 135 136 136 netdev->features = NETIF_F_LLTX | NETIF_F_SG | NETIF_F_FRAGLIST |