summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2010-09-17 11:25:07 +0200
committerDavid S. Miller <davem@davemloft.net>2010-09-18 01:53:24 +0200
commite6599c2ecf18002339fe81cde1fa83b37bf26290 (patch)
tree8cd7549605c0459e9730537e0e9235e6d01355d8
parentethtool: Add comments for valid use of flow types (diff)
downloadlinux-e6599c2ecf18002339fe81cde1fa83b37bf26290.tar.xz
linux-e6599c2ecf18002339fe81cde1fa83b37bf26290.zip
bonding: enable gro by default
gro can be enabled by default on bonding devices. Actual support depends on the lower devices. One can still use ethtool to switch off GRO if needed. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/bonding/bond_main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 3b16f62d5606..fb70c3e12927 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/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)