Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39187646 authored by Michał Mirosław's avatar Michał Mirosław Committed by David S. Miller
Browse files

net: macvlan: convert to hw_features 



Not much of a conversion anyway - macvlan has no way to change the offload
settings independently to its base device.

Signed-off-by: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9c6bc165

drivers/net/macvlan.c

+1 −15
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ static struct lock_class_key macvlan_netdev_addr_lock_key; 
#define MACVLAN_FEATURES \

	(NETIF_F_SG | NETIF_F_ALL_CSUM | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST | \

	 NETIF_F_GSO | NETIF_F_TSO | NETIF_F_UFO | NETIF_F_GSO_ROBUST | \

	 NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_GRO)

	 NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_GRO | NETIF_F_RXCSUM)



#define MACVLAN_STATE_MASK \

	((1<<__LINK_STATE_NOCARRIER) | (1<<__LINK_STATE_DORMANT))
@@ -517,12 +517,6 @@ static void macvlan_ethtool_get_drvinfo(struct net_device *dev, 
	snprintf(drvinfo->version, 32, "0.1");

}



static u32 macvlan_ethtool_get_rx_csum(struct net_device *dev)

{

	const struct macvlan_dev *vlan = netdev_priv(dev);

	return dev_ethtool_get_rx_csum(vlan->lowerdev);

}



static int macvlan_ethtool_get_settings(struct net_device *dev,

					struct ethtool_cmd *cmd)

{
@@ -530,18 +524,10 @@ static int macvlan_ethtool_get_settings(struct net_device *dev, 
	return dev_ethtool_get_settings(vlan->lowerdev, cmd);

}



static u32 macvlan_ethtool_get_flags(struct net_device *dev)

{

	const struct macvlan_dev *vlan = netdev_priv(dev);

	return dev_ethtool_get_flags(vlan->lowerdev);

}



static const struct ethtool_ops macvlan_ethtool_ops = {

	.get_link		= ethtool_op_get_link,

	.get_settings		= macvlan_ethtool_get_settings,

	.get_rx_csum		= macvlan_ethtool_get_rx_csum,

	.get_drvinfo		= macvlan_ethtool_get_drvinfo,

	.get_flags		= macvlan_ethtool_get_flags,

};



static const struct net_device_ops macvlan_netdev_ops = {