2 files changed, 3 insertions, 52 deletions

diff --git a/drivers/net/atl1e/atl1e_ethtool.c b/drivers/net/atl1e/atl1e_ethtool.c
index 60edb9f232bb..a76006c1bc6b 100644
--- a/drivers/net/atl1e/atl1e_ethtool.c
+++ b/drivers/net/atl1e/atl1e_ethtool.c
@@ -131,11 +131,6 @@ static int atl1e_set_settings(struct net_device *netdev,
         return 0;
 }
 
-static u32 atl1e_get_tx_csum(struct net_device *netdev)
-{
-        return (netdev->features & NETIF_F_HW_CSUM) != 0;
-}
-
 static u32 atl1e_get_msglevel(struct net_device *netdev)
 {
 #ifdef DBG
@@ -145,10 +140,6 @@ static u32 atl1e_get_msglevel(struct net_device *netdev)
 #endif
 }
 
-static void atl1e_set_msglevel(struct net_device *netdev, u32 data)
-{
-}
-
 static int atl1e_get_regs_len(struct net_device *netdev)
 {
         return AT_REGS_LEN * sizeof(u32);
@@ -387,18 +378,14 @@ static const struct ethtool_ops atl1e_ethtool_ops = {
         .get_wol                = atl1e_get_wol,
         .set_wol                = atl1e_set_wol,
         .get_msglevel           = atl1e_get_msglevel,
-        .set_msglevel           = atl1e_set_msglevel,
         .nway_reset             = atl1e_nway_reset,
         .get_link               = ethtool_op_get_link,
         .get_eeprom_len         = atl1e_get_eeprom_len,
         .get_eeprom             = atl1e_get_eeprom,
         .set_eeprom             = atl1e_set_eeprom,
-        .get_tx_csum            = atl1e_get_tx_csum,
-        .get_sg                 = ethtool_op_get_sg,
+        .set_tx_csum            = ethtool_op_set_tx_hw_csum,
         .set_sg                 = ethtool_op_set_sg,
-#ifdef NETIF_F_TSO
-        .get_tso                = ethtool_op_get_tso,
-#endif
+        .set_tso                = ethtool_op_set_tso,
 };
 
 void atl1e_set_ethtool_ops(struct net_device *netdev)
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c
index 8b889ab544b0..08f8c0969e9b 100644
--- a/drivers/net/atl1e/atl1e_main.c
+++ b/drivers/net/atl1e/atl1e_main.c
@@ -1664,41 +1664,6 @@ static int atl1e_tso_csum(struct atl1e_adapter *adapter,
                         }
                         return 0;
                 }
-
-                if (offload_type & SKB_GSO_TCPV6) {
-                        real_len = (((unsigned char *)ipv6_hdr(skb) - skb->data)
-                                        + ntohs(ipv6_hdr(skb)->payload_len));
-                        if (real_len < skb->len)
-                                pskb_trim(skb, real_len);
-
-                        /* check payload == 0 byte ? */
-                        hdr_len = (skb_transport_offset(skb) + tcp_hdrlen(skb));
-                        if (unlikely(skb->len == hdr_len)) {
-                                /* only xsum need */
-                                dev_warn(&pdev->dev,
-                                        "IPV6 tso with zero data??\n");
-                                goto check_sum;
-                        } else {
-                                tcp_hdr(skb)->check = ~csum_ipv6_magic(
-                                                &ipv6_hdr(skb)->saddr,
-                                                &ipv6_hdr(skb)->daddr,
-                                                0, IPPROTO_TCP, 0);
-                                tpd->word3 |= 1 << TPD_IP_VERSION_SHIFT;
-                                hdr_len >>= 1;
-                                tpd->word3 |= (hdr_len & TPD_V6_IPHLLO_MASK) <<
-                                        TPD_V6_IPHLLO_SHIFT;
-                                tpd->word3 |= ((hdr_len >> 3) &
-                                        TPD_V6_IPHLHI_MASK) <<
-                                        TPD_V6_IPHLHI_SHIFT;
-                                tpd->word3 |= (tcp_hdrlen(skb) >> 2 &
-                                        TPD_TCPHDRLEN_MASK) <<
-                                        TPD_TCPHDRLEN_SHIFT;
-                                tpd->word3 |= ((skb_shinfo(skb)->gso_size) &
-                                        TPD_MSS_MASK) << TPD_MSS_SHIFT;
-                                        tpd->word3 |= 1 << TPD_SEGMENT_EN_SHIFT;
-                        }
-                }
-                return 0;
         }
 
 check_sum:
@@ -1930,7 +1895,7 @@ static int atl1e_request_irq(struct atl1e_adapter *adapter)
 
         if (!adapter->have_msi)
                 flags |= IRQF_SHARED;
-        err = request_irq(adapter->pdev->irq, &atl1e_intr, flags,
+        err = request_irq(adapter->pdev->irq, atl1e_intr, flags,
                         netdev->name, netdev);
         if (err) {
                 dev_dbg(&pdev->dev,
@@ -2287,7 +2252,6 @@ static int atl1e_init_netdev(struct net_device *netdev, struct pci_dev *pdev)
                 NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
         netdev->features |= NETIF_F_LLTX;
         netdev->features |= NETIF_F_TSO;
-        netdev->features |= NETIF_F_TSO6;
 
         return 0;
 }