aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding/bond_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
-rw-r--r--drivers/net/bonding/bond_main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 3eebfe287533..7be23364a9d6 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1225,7 +1225,8 @@ static int bond_compute_features(struct bonding *bond)
1225 struct slave *slave; 1225 struct slave *slave;
1226 struct net_device *bond_dev = bond->dev; 1226 struct net_device *bond_dev = bond->dev;
1227 unsigned long features = bond_dev->features; 1227 unsigned long features = bond_dev->features;
1228 unsigned short max_hard_header_len = ETH_HLEN; 1228 unsigned short max_hard_header_len = max((u16)ETH_HLEN,
1229 bond_dev->hard_header_len);
1229 int i; 1230 int i;
1230 1231
1231 features &= ~(NETIF_F_ALL_CSUM | BOND_VLAN_FEATURES); 1232 features &= ~(NETIF_F_ALL_CSUM | BOND_VLAN_FEATURES);