git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
gianfar: do vlan cleanup
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
gianfar_ethtool.c
diff --git
a/drivers/net/gianfar_ethtool.c
b/drivers/net/gianfar_ethtool.c
index 203369cc1272a1051bcca2fe6024c06e2e7804de..6e350692d1184147b0989e19d8be3b8436938d29 100644
(file)
--- a/
drivers/net/gianfar_ethtool.c
+++ b/
drivers/net/gianfar_ethtool.c
@@
-526,6
+526,9
@@
int gfar_set_features(struct net_device *dev, u32 features)
int err = 0, i = 0;
u32 changed = dev->features ^ features;
+ if (changed & (NETIF_F_HW_VLAN_TX|NETIF_F_HW_VLAN_RX))
+ gfar_vlan_mode(dev, features);
+
if (!(changed & NETIF_F_RXCSUM))
return 0;