From 616633cfb3ba0385570cfb92823eee84116fb81e Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Fri, 17 Sep 2010 09:25:07 +0000 Subject: [PATCH] --- yaml --- r: 214573 b: refs/heads/master c: e6599c2ecf18002339fe81cde1fa83b37bf26290 h: refs/heads/master i: 214571: 4485cd20837a8c9c085e7bff11f51e609e753275 v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_main.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8897a72f0124..e9616635cad3 100644 --- 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 index 3b16f62d5606..fb70c3e12927 100644 --- 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)