1 files changed, 12 insertions, 0 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index b0eee49a2489..4b43f5dcabcd 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -7424,6 +7424,18 @@ static netdev_features_t netdev_fix_features(struct net_device *dev,
                 features &= ~dev->gso_partial_features;
         }
 
+        if (!(features & NETIF_F_RXCSUM)) {
+                /* NETIF_F_GRO_HW implies doing RXCSUM since every packet
+                 * successfully merged by hardware must also have the
+                 * checksum verified by hardware.  If the user does not
+                 * want to enable RXCSUM, logically, we should disable GRO_HW.
+                 */
+                if (features & NETIF_F_GRO_HW) {
+                        netdev_dbg(dev, "Dropping NETIF_F_GRO_HW since no RXCSUM feature.\n");
+                        features &= ~NETIF_F_GRO_HW;
+                }
+        }
+
         return features;
 }