Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[mirror_ubuntu-artful-kernel.git] / drivers / net / ethernet / atheros / alx / main.c

diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c
index 7dcc907a449d60adcbeb27cf58434edb0442792b..391bb5c09a6a95e404ea5842c5987b8ae1758901 100644 (file)
--- a/drivers/net/ethernet/atheros/alx/main.c
+++ b/drivers/net/ethernet/atheros/alx/main.c
@@ -1648,8 +1648,8 @@ static void alx_poll_controller(struct net_device *netdev)
 }
 #endif
 
-static struct rtnl_link_stats64 *alx_get_stats64(struct net_device *dev,
-                                       struct rtnl_link_stats64 *net_stats)
+static void alx_get_stats64(struct net_device *dev,
+                           struct rtnl_link_stats64 *net_stats)
 {
        struct alx_priv *alx = netdev_priv(dev);
        struct alx_hw_stats *hw_stats = &alx->hw.stats;
@@ -1693,8 +1693,6 @@ static struct rtnl_link_stats64 *alx_get_stats64(struct net_device *dev,
        net_stats->rx_packets = hw_stats->rx_ok + net_stats->rx_errors;
 
        spin_unlock(&alx->stats_lock);
-
-       return net_stats;
 }
 
 static const struct net_device_ops alx_netdev_ops = {
@@ -1823,6 +1821,7 @@ static int alx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        netdev->hw_features = NETIF_F_SG |
                              NETIF_F_HW_CSUM |
+                             NETIF_F_RXCSUM |
                              NETIF_F_TSO |
                              NETIF_F_TSO6;