diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2014-01-22 11:06:54 -0600 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2014-01-22 11:06:54 -0600 |
| commit | a7fd051cd1119af788dd161a4c834b06377d76a8 (patch) | |
| tree | 80368fccae171d1b0446f3e2b4fd4d9b43e65cbe /drivers/net/ethernet/ibm/ehea/ehea_main.c | |
| parent | 00629ac158e1be3124b796078cf0347b946cb053 (diff) | |
| parent | 1071ea6e68ead40df739b223e9013d99c23c19ab (diff) | |
Merge tag 'v3.10.27' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-lnglinux-lng-3.10.27-2014.02
This is the 3.10.27 stable release
Diffstat (limited to 'drivers/net/ethernet/ibm/ehea/ehea_main.c')
| -rw-r--r-- | drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c index 90ea0b1673ca..716dae7b9d8e 100644 --- a/drivers/net/ethernet/ibm/ehea/ehea_main.c +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c @@ -3023,7 +3023,7 @@ static struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter, dev->hw_features = NETIF_F_SG | NETIF_F_TSO | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_CTAG_TX; - dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO | + dev->features = NETIF_F_SG | NETIF_F_TSO | NETIF_F_HIGHDMA | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_RXCSUM; |