diff options
author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-13 09:57:38 -0400 |
---|---|---|
committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-13 09:57:38 -0400 |
commit | f7f24758ac98a506770bc5910d33567610fa3403 (patch) | |
tree | ff7fad3d01bf9dc2e2e54b908f9fca4891e1ee72 /net/8021q | |
parent | b38a3ab3d1bb0dc3288f73903d4dc4672b5cd2d0 (diff) | |
parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'net/8021q')
-rw-r--r-- | net/8021q/Kconfig | 19 | ||||
-rw-r--r-- | net/8021q/vlan.c | 8 |
2 files changed, 27 insertions, 0 deletions
diff --git a/net/8021q/Kconfig b/net/8021q/Kconfig new file mode 100644 index 000000000000..c4a382e450e2 --- /dev/null +++ b/net/8021q/Kconfig | |||
@@ -0,0 +1,19 @@ | |||
1 | # | ||
2 | # Configuration for 802.1Q VLAN support | ||
3 | # | ||
4 | |||
5 | config VLAN_8021Q | ||
6 | tristate "802.1Q VLAN Support" | ||
7 | ---help--- | ||
8 | Select this and you will be able to create 802.1Q VLAN interfaces | ||
9 | on your ethernet interfaces. 802.1Q VLAN supports almost | ||
10 | everything a regular ethernet interface does, including | ||
11 | firewalling, bridging, and of course IP traffic. You will need | ||
12 | the 'vconfig' tool from the VLAN project in order to effectively | ||
13 | use VLANs. See the VLAN web page for more information: | ||
14 | <http://www.candelatech.com/~greear/vlan.html> | ||
15 | |||
16 | To compile this code as a module, choose M here: the module | ||
17 | will be called 8021q. | ||
18 | |||
19 | If unsure, say N. | ||
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index 1f6d31670bc7..91e412b0ab00 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c | |||
@@ -578,6 +578,14 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event, | |||
578 | if (!vlandev) | 578 | if (!vlandev) |
579 | continue; | 579 | continue; |
580 | 580 | ||
581 | if (netif_carrier_ok(dev)) { | ||
582 | if (!netif_carrier_ok(vlandev)) | ||
583 | netif_carrier_on(vlandev); | ||
584 | } else { | ||
585 | if (netif_carrier_ok(vlandev)) | ||
586 | netif_carrier_off(vlandev); | ||
587 | } | ||
588 | |||
581 | if ((vlandev->state & VLAN_LINK_STATE_MASK) != flgs) { | 589 | if ((vlandev->state & VLAN_LINK_STATE_MASK) != flgs) { |
582 | vlandev->state = (vlandev->state &~ VLAN_LINK_STATE_MASK) | 590 | vlandev->state = (vlandev->state &~ VLAN_LINK_STATE_MASK) |
583 | | flgs; | 591 | | flgs; |