net: benet: convert to hw_features

Simple conversion.

This also fixes a bug in TX checksum toggling --- driver was changing
NETIF_F_HW_CSUM instead of NETIF_F_IP_CSUM+NETIF_F_IPV6_CSUM.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 10 insertions, 37 deletions

diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h
index d2c42f5d5e9e..a0b4743d7224 100644
--- a/drivers/net/benet/be.h
+++ b/drivers/net/benet/be.h
@@ -307,7 +307,6 @@ struct be_adapter {
         u16 work_counter;
 
         /* Ethtool knobs and info */
-        bool rx_csum;           /* BE card must perform rx-checksumming */
         char fw_ver[FW_VER_LEN];
         u32 if_handle;          /* Used to configure filtering */
         u32 pmac_id;            /* MAC addr handle used by BE card */
diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c
index 1565c81ff96c..96f5502e0ef7 100644
--- a/drivers/net/benet/be_ethtool.c
+++ b/drivers/net/benet/be_ethtool.c
@@ -261,25 +261,6 @@ be_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *coalesce)
         return 0;
 }
 
-static u32 be_get_rx_csum(struct net_device *netdev)
-{
-        struct be_adapter *adapter = netdev_priv(netdev);
-
-        return adapter->rx_csum;
-}
-
-static int be_set_rx_csum(struct net_device *netdev, uint32_t data)
-{
-        struct be_adapter *adapter = netdev_priv(netdev);
-
-        if (data)
-                adapter->rx_csum = true;
-        else
-                adapter->rx_csum = false;
-
-        return 0;
-}
-
 static void
 be_get_ethtool_stats(struct net_device *netdev,
                 struct ethtool_stats *stats, uint64_t *data)
@@ -760,14 +741,6 @@ const struct ethtool_ops be_ethtool_ops = {
         .get_ringparam = be_get_ringparam,
         .get_pauseparam = be_get_pauseparam,
         .set_pauseparam = be_set_pauseparam,
-        .get_rx_csum = be_get_rx_csum,
-        .set_rx_csum = be_set_rx_csum,
-        .get_tx_csum = ethtool_op_get_tx_csum,
-        .set_tx_csum = ethtool_op_set_tx_hw_csum,
-        .get_sg = ethtool_op_get_sg,
-        .set_sg = ethtool_op_set_sg,
-        .get_tso = ethtool_op_get_tso,
-        .set_tso = ethtool_op_set_tso,
         .get_strings = be_get_stat_strings,
         .set_phys_id = be_set_phys_id,
         .get_sset_count = be_get_sset_count,
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index b8831403400c..58a652f81862 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -988,9 +988,10 @@ static void be_rx_compl_process(struct be_adapter *adapter,
                         struct be_rx_obj *rxo,
                         struct be_rx_compl_info *rxcp)
 {
+        struct net_device *netdev = adapter->netdev;
         struct sk_buff *skb;
 
-        skb = netdev_alloc_skb_ip_align(adapter->netdev, BE_HDR_LEN);
+        skb = netdev_alloc_skb_ip_align(netdev, BE_HDR_LEN);
         if (unlikely(!skb)) {
                 if (net_ratelimit())
                         dev_warn(&adapter->pdev->dev, "skb alloc failed\n");
@@ -1000,13 +1001,13 @@ static void be_rx_compl_process(struct be_adapter *adapter,
 
         skb_fill_rx_data(adapter, rxo, skb, rxcp);
 
-        if (likely(adapter->rx_csum && csum_passed(rxcp)))
+        if (likely((netdev->features & NETIF_F_RXCSUM) && csum_passed(rxcp)))
                 skb->ip_summed = CHECKSUM_UNNECESSARY;
         else
                 skb_checksum_none_assert(skb);
 
         skb->truesize = skb->len + sizeof(struct sk_buff);
-        skb->protocol = eth_type_trans(skb, adapter->netdev);
+        skb->protocol = eth_type_trans(skb, netdev);
         if (adapter->netdev->features & NETIF_F_RXHASH)
                 skb->rxhash = rxcp->rss_hash;
 
@@ -2627,10 +2628,12 @@ static void be_netdev_init(struct net_device *netdev)
         struct be_rx_obj *rxo;
         int i;
 
-        netdev->features |= NETIF_F_SG | NETIF_F_HW_VLAN_RX | NETIF_F_TSO |
-                NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_FILTER |
-                NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
-                NETIF_F_GRO | NETIF_F_TSO6;
+        netdev->hw_features |= NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6 |
+                NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM;
+
+        netdev->features |= netdev->hw_features |
+                NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX |
+                NETIF_F_HW_VLAN_FILTER;
 
         if (be_multi_rxq(adapter))
                 netdev->features |= NETIF_F_RXHASH;
@@ -2643,8 +2646,6 @@ static void be_netdev_init(struct net_device *netdev)
 
         netdev->flags |= IFF_MULTICAST;
 
-        adapter->rx_csum = true;
-
         /* Default settings for Rx and Tx flow control */
         adapter->rx_fc = true;
         adapter->tx_fc = true;