projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.26' into bkl-removal
[firefly-linux-kernel-4.4.55.git]
/
net
/
8021q
/
vlan_dev.c
diff --git
a/net/8021q/vlan_dev.c
b/net/8021q/vlan_dev.c
index c961f0826005bc196c90c687a41297e6860d8c6b..5d055c242ed8e224ea602bce5291c10f059af90c 100644
(file)
--- a/
net/8021q/vlan_dev.c
+++ b/
net/8021q/vlan_dev.c
@@
-663,6
+663,8
@@
static int vlan_dev_init(struct net_device *dev)
(1<<__LINK_STATE_DORMANT))) |
(1<<__LINK_STATE_PRESENT);
+ dev->features |= real_dev->features & real_dev->vlan_features;
+
/* ipv6 shared card related stuff */
dev->dev_id = real_dev->dev_id;