diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-21 16:38:42 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-21 16:38:42 -0400 |
| commit | 033b1142f4bd44a116d1356fe4a0510437ceddf9 (patch) | |
| tree | d2a971a7dc9f3a1af8035e38419c4c4ad8c22632 /drivers/net/bonding | |
| parent | f5caadbb3d8fc0b71533e880c684b2230bdb76ac (diff) | |
| parent | e6625fa48e6580a74b7e700efd7e6463e282810b (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/bluetooth/l2cap_core.c
Diffstat (limited to 'drivers/net/bonding')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 61265f74ed3..b9eaf5c0dc7 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
| @@ -1415,9 +1415,9 @@ out: | |||
| 1415 | return features; | 1415 | return features; |
| 1416 | } | 1416 | } |
| 1417 | 1417 | ||
| 1418 | #define BOND_VLAN_FEATURES (NETIF_F_ALL_TX_OFFLOADS | \ | 1418 | #define BOND_VLAN_FEATURES (NETIF_F_ALL_CSUM | NETIF_F_SG | \ |
| 1419 | NETIF_F_SOFT_FEATURES | \ | 1419 | NETIF_F_FRAGLIST | NETIF_F_ALL_TSO | \ |
| 1420 | NETIF_F_LRO) | 1420 | NETIF_F_HIGHDMA | NETIF_F_LRO) |
| 1421 | 1421 | ||
| 1422 | static void bond_compute_features(struct bonding *bond) | 1422 | static void bond_compute_features(struct bonding *bond) |
| 1423 | { | 1423 | { |