projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.10.108' into update
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
net
/
8021q
/
vlan.c
diff --git
a/net/8021q/vlan.c
b/net/8021q/vlan.c
index 86abb2e59aea22ad8ca86d70571615b7deef1167..82fdb35154fca985bc426d36d9f7ae2d97cebd8b 100644
(file)
--- a/
net/8021q/vlan.c
+++ b/
net/8021q/vlan.c
@@
-274,7
+274,8
@@
static int register_vlan_device(struct net_device *real_dev, u16 vlan_id)
return 0;
out_free_newdev:
- free_netdev(new_dev);
+ if (new_dev->reg_state == NETREG_UNINITIALIZED)
+ free_netdev(new_dev);
return err;
}