aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/neterion
diff options
context:
space:
mode:
authorWilfried Klaebe <w-lkml@lebenslange-mailadresse.de>2014-05-10 20:12:32 -0400
committerDavid S. Miller <davem@davemloft.net>2014-05-13 17:43:20 -0400
commit7ad24ea4bf620a32631d7b3069c3e30c078b0c3e (patch)
treecdb3585122d2c7b99106edf4cbeebfd86c5aa7bf /drivers/net/ethernet/neterion
parent0f49ff07025e8d6cd25bce5b623881739e04926e (diff)
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>
Diffstat (limited to 'drivers/net/ethernet/neterion')
-rw-r--r--drivers/net/ethernet/neterion/s2io.c2
-rw-r--r--drivers/net/ethernet/neterion/vxge/vxge-ethtool.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c
index e900c1abdef7..e3cf38e6ce3c 100644
--- a/drivers/net/ethernet/neterion/s2io.c
+++ b/drivers/net/ethernet/neterion/s2io.c
@@ -7910,7 +7910,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
7910 7910
7911 /* Driver entry points */ 7911 /* Driver entry points */
7912 dev->netdev_ops = &s2io_netdev_ops; 7912 dev->netdev_ops = &s2io_netdev_ops;
7913 SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops); 7913 dev->ethtool_ops = &netdev_ethtool_ops;
7914 dev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | 7914 dev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM |
7915 NETIF_F_TSO | NETIF_F_TSO6 | 7915 NETIF_F_TSO | NETIF_F_TSO6 |
7916 NETIF_F_RXCSUM | NETIF_F_LRO; 7916 NETIF_F_RXCSUM | NETIF_F_LRO;
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-ethtool.c b/drivers/net/ethernet/neterion/vxge/vxge-ethtool.c
index f8f073880f84..ddcc81ad1ae1 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-ethtool.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-ethtool.c
@@ -1128,5 +1128,5 @@ static const struct ethtool_ops vxge_ethtool_ops = {
1128 1128
1129void vxge_initialize_ethtool_ops(struct net_device *ndev) 1129void 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}