diff options
| author | Keith Packard <keithp@keithp.com> | 2011-07-22 13:40:42 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-07-22 13:40:42 -0700 |
| commit | df7976797fa9af161690dbf4dee81ed92cdc150f (patch) | |
| tree | be6f04706d91cc80da4dbd3a5f5f2a174f1bdae3 /net/8021q/vlan_dev.c | |
| parent | f0b69efc29b024747a88ce020dada425e3193d5a (diff) | |
| parent | 9c54c0dd948d715ccfd79e97d852f80eeb53254a (diff) | |
| download | linux-df7976797fa9af161690dbf4dee81ed92cdc150f.tar.bz2 | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'net/8021q/vlan_dev.c')
| -rw-r--r-- | net/8021q/vlan_dev.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 86bff9b1ac47..6e82148edfc8 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -528,7 +528,11 @@ static int vlan_dev_init(struct net_device *dev) (1<<__LINK_STATE_DORMANT))) | (1<<__LINK_STATE_PRESENT); - dev->hw_features = NETIF_F_ALL_TX_OFFLOADS; + dev->hw_features = NETIF_F_ALL_CSUM | NETIF_F_SG | + NETIF_F_FRAGLIST | NETIF_F_ALL_TSO | + NETIF_F_HIGHDMA | NETIF_F_SCTP_CSUM | + NETIF_F_ALL_FCOE; + dev->features |= real_dev->vlan_features | NETIF_F_LLTX; dev->gso_max_size = real_dev->gso_max_size; |