---

yaml --- r: 214573 b: refs/heads/master c: e6599c2 h: refs/heads/master i: 214571: 4485cd2 v: v3
git-mirror · Sep 17, 2010 · 616633c · 616633c
1 parent 58c1519
commit 616633c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07af7a2bfa853db3957a22f9a41f437bf0f10e63
+refs/heads/master: e6599c2ecf18002339fe81cde1fa83b37bf26290
diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c
@@ -4678,6 +4678,10 @@ static void bond_setup(struct net_device *bond_dev)
 			       NETIF_F_HW_VLAN_RX |
 			       NETIF_F_HW_VLAN_FILTER);
 
+	/* By default, we enable GRO on bonding devices.
+	 * Actual support requires lowlevel drivers are GRO ready.
+	 */
+	bond_dev->features |= NETIF_F_GRO;
 }
 
 static void bond_work_cancel_all(struct bonding *bond)