aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/macvlan.c
diff options
context:
space:
mode:
authorMichał Mirosław <mirq-linux@rere.qmqm.pl>2011-04-16 20:15:46 -0400
committerDavid S. Miller <davem@davemloft.net>2011-04-17 20:40:24 -0400
commit391876466670988196786150fc9d9da2f3c7cecb (patch)
tree3a29b0b17ac5f32591fbcc389d414d1dc0aba9bb /drivers/net/macvlan.c
parent9c6bc16577171100e5efab0ea09ebf5884822ed6 (diff)
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: Michał Mirosław <mirq-linux@rere.qmqm.pl> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/macvlan.c')
-rw-r--r--drivers/net/macvlan.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 78e34e9e4f00..3ad5425b82dd 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -415,7 +415,7 @@ static struct lock_class_key macvlan_netdev_addr_lock_key;
415#define MACVLAN_FEATURES \ 415#define MACVLAN_FEATURES \
416 (NETIF_F_SG | NETIF_F_ALL_CSUM | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST | \ 416 (NETIF_F_SG | NETIF_F_ALL_CSUM | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST | \
417 NETIF_F_GSO | NETIF_F_TSO | NETIF_F_UFO | NETIF_F_GSO_ROBUST | \ 417 NETIF_F_GSO | NETIF_F_TSO | NETIF_F_UFO | NETIF_F_GSO_ROBUST | \
418 NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_GRO) 418 NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_GRO | NETIF_F_RXCSUM)
419 419
420#define MACVLAN_STATE_MASK \ 420#define MACVLAN_STATE_MASK \
421 ((1<<__LINK_STATE_NOCARRIER) | (1<<__LINK_STATE_DORMANT)) 421 ((1<<__LINK_STATE_NOCARRIER) | (1<<__LINK_STATE_DORMANT))
@@ -517,12 +517,6 @@ static void macvlan_ethtool_get_drvinfo(struct net_device *dev,
517 snprintf(drvinfo->version, 32, "0.1"); 517 snprintf(drvinfo->version, 32, "0.1");
518} 518}
519 519
520static u32 macvlan_ethtool_get_rx_csum(struct net_device *dev)
521{
522 const struct macvlan_dev *vlan = netdev_priv(dev);
523 return dev_ethtool_get_rx_csum(vlan->lowerdev);
524}
525
526static int macvlan_ethtool_get_settings(struct net_device *dev, 520static int macvlan_ethtool_get_settings(struct net_device *dev,
527 struct ethtool_cmd *cmd) 521 struct ethtool_cmd *cmd)
528{ 522{
@@ -530,18 +524,10 @@ static int macvlan_ethtool_get_settings(struct net_device *dev,
530 return dev_ethtool_get_settings(vlan->lowerdev, cmd); 524 return dev_ethtool_get_settings(vlan->lowerdev, cmd);
531} 525}
532 526
533static u32 macvlan_ethtool_get_flags(struct net_device *dev)
534{
535 const struct macvlan_dev *vlan = netdev_priv(dev);
536 return dev_ethtool_get_flags(vlan->lowerdev);
537}
538
539static const struct ethtool_ops macvlan_ethtool_ops = { 527static const struct ethtool_ops macvlan_ethtool_ops = {
540 .get_link = ethtool_op_get_link, 528 .get_link = ethtool_op_get_link,
541 .get_settings = macvlan_ethtool_get_settings, 529 .get_settings = macvlan_ethtool_get_settings,
542 .get_rx_csum = macvlan_ethtool_get_rx_csum,
543 .get_drvinfo = macvlan_ethtool_get_drvinfo, 530 .get_drvinfo = macvlan_ethtool_get_drvinfo,
544 .get_flags = macvlan_ethtool_get_flags,
545}; 531};
546 532
547static const struct net_device_ops macvlan_netdev_ops = { 533static const struct net_device_ops macvlan_netdev_ops = {