2 files changed, 18 insertions, 2 deletions

diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index f0a20facc650..a499b6b31ca2 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -311,10 +311,17 @@ static u32 ixgbe_get_tx_csum(struct net_device *netdev)
 
 static int ixgbe_set_tx_csum(struct net_device *netdev, u32 data)
 {
-        if (data)
+        struct ixgbe_adapter *adapter = netdev_priv(netdev);
+
+        if (data) {
                 netdev->features |= (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM);
-        else
+                if (adapter->hw.mac.type == ixgbe_mac_82599EB)
+                        netdev->features |= NETIF_F_SCTP_CSUM;
+        } else {
                 netdev->features &= ~(NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM);
+                if (adapter->hw.mac.type == ixgbe_mac_82599EB)
+                        netdev->features &= ~NETIF_F_SCTP_CSUM;
+        }
 
         return 0;
 }
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 42b803d5cfd3..c3dff8f02e33 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -4189,12 +4189,18 @@ static bool ixgbe_tx_csum(struct ixgbe_adapter *adapter,
                                 if (ip_hdr(skb)->protocol == IPPROTO_TCP)
                                         type_tucmd_mlhl |=
                                                 IXGBE_ADVTXD_TUCMD_L4T_TCP;
+                                else if (ip_hdr(skb)->protocol == IPPROTO_SCTP)
+                                        type_tucmd_mlhl |=
+                                                IXGBE_ADVTXD_TUCMD_L4T_SCTP;
                                 break;
                         case cpu_to_be16(ETH_P_IPV6):
                                 /* XXX what about other V6 headers?? */
                                 if (ipv6_hdr(skb)->nexthdr == IPPROTO_TCP)
                                         type_tucmd_mlhl |=
                                                 IXGBE_ADVTXD_TUCMD_L4T_TCP;
+                                else if (ipv6_hdr(skb)->nexthdr == IPPROTO_SCTP)
+                                        type_tucmd_mlhl |=
+                                                IXGBE_ADVTXD_TUCMD_L4T_SCTP;
                                 break;
                         default:
                                 if (unlikely(net_ratelimit())) {
@@ -4718,6 +4724,9 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
         netdev->features |= NETIF_F_TSO6;
         netdev->features |= NETIF_F_GRO;
 
+        if (adapter->hw.mac.type == ixgbe_mac_82599EB)
+                netdev->features |= NETIF_F_SCTP_CSUM;
+
         netdev->vlan_features |= NETIF_F_TSO;
         netdev->vlan_features |= NETIF_F_TSO6;
         netdev->vlan_features |= NETIF_F_IP_CSUM;