diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-09-03 16:38:52 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-03 16:38:52 -0400 |
| commit | 68885a3ff38ed51fa02f241feb405c9922a90ee0 (patch) | |
| tree | 2fc626df39d5e0e1f6b065238141f7d49187c737 /net/8021q/vlan_dev.c | |
| parent | 7b28079b3284ccb15ad4f003fb7073890600d0c1 (diff) | |
| parent | a2acad8298a42b7be684a32fafaf83332bba9c2b (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'net/8021q/vlan_dev.c')
| -rw-r--r-- | net/8021q/vlan_dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 3d59c9bf8feb..3bccdd12a264 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c | |||
| @@ -510,7 +510,8 @@ static int vlan_dev_open(struct net_device *dev) | |||
| 510 | if (vlan->flags & VLAN_FLAG_GVRP) | 510 | if (vlan->flags & VLAN_FLAG_GVRP) |
| 511 | vlan_gvrp_request_join(dev); | 511 | vlan_gvrp_request_join(dev); |
| 512 | 512 | ||
| 513 | netif_carrier_on(dev); | 513 | if (netif_carrier_ok(real_dev)) |
| 514 | netif_carrier_on(dev); | ||
| 514 | return 0; | 515 | return 0; |
| 515 | 516 | ||
| 516 | clear_allmulti: | 517 | clear_allmulti: |