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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[sfrench/cifs-2.6.git]
/
net
/
8021q
/
vlan.c
diff --git
a/net/8021q/vlan.c
b/net/8021q/vlan.c
index 2b7390e377b3f3a7d6a9e92fb2cbea73d8b6d401..d1e10546eb85d824b8f06e499358634bc9c2288b 100644
(file)
--- a/
net/8021q/vlan.c
+++ b/
net/8021q/vlan.c
@@
-492,6
+492,7
@@
static int vlan_device_event(struct notifier_block *unused, unsigned long event,
continue;
dev_change_flags(vlandev, flgs & ~IFF_UP);
+ vlan_transfer_operstate(dev, vlandev);
}
break;
@@
-507,6
+508,7
@@
static int vlan_device_event(struct notifier_block *unused, unsigned long event,
continue;
dev_change_flags(vlandev, flgs | IFF_UP);
+ vlan_transfer_operstate(dev, vlandev);
}
break;