ethtool: device independent rx_csum and get_flags routines

This helps avoid error messages with ethtool -k on devices that
don't provide device specific routines.

Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
------------------------------------------------------------------
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index d9d5160610d5e87741965bcddc126f46a4f5c0cd..cf36ff44ebb2520339d3ff5045499a3321756239 100644 (file)
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -30,6 +30,11 @@ u32 ethtool_op_get_link(struct net_device *dev)
        return netif_carrier_ok(dev) ? 1 : 0;
 }
 
+u32 ethtool_op_get_rx_csum(struct net_device *dev)
+{
+       return (dev->features & NETIF_F_ALL_CSUM) != 0;
+}
+
 u32 ethtool_op_get_tx_csum(struct net_device *dev)
 {
        return (dev->features & NETIF_F_ALL_CSUM) != 0;
@@ -1004,7 +1009,9 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)
                break;
        case ETHTOOL_GRXCSUM:
                rc = ethtool_get_value(dev, useraddr, ethcmd,
-                                      dev->ethtool_ops->get_rx_csum);
+                                      (dev->ethtool_ops->get_rx_csum ?
+                                       dev->ethtool_ops->get_rx_csum :
+                                       ethtool_op_get_rx_csum));
                break;
        case ETHTOOL_SRXCSUM:
                rc = ethtool_set_rx_csum(dev, useraddr);
@@ -1068,7 +1075,9 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)
                break;
        case ETHTOOL_GFLAGS:
                rc = ethtool_get_value(dev, useraddr, ethcmd,
-                                      dev->ethtool_ops->get_flags);
+                                      (dev->ethtool_ops->get_flags ?
+                                       dev->ethtool_ops->get_flags :
+                                       ethtool_op_get_flags));
                break;
        case ETHTOOL_SFLAGS:
                rc = ethtool_set_value(dev, useraddr,