---

yaml --- r: 327642 b: refs/heads/master c: 1411af1 h: refs/heads/master v: v3
git-mirror · Jul 31, 2012 · 1cc0bfd · 1cc0bfd
1 parent 8997454
commit 1cc0bfd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c405c6298eacd423098afacf6020ddbda1b0378b
+refs/heads/master: 1411af156524ce42c2a7f989320c4484257f3ff5
diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c
@@ -546,6 +546,8 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
 		case NL80211_IFTYPE_MESH_POINT:
 			netif_carrier_off(dev);
 			break;
+		case NL80211_IFTYPE_WDS:
+			break;
 		default:
 			netif_carrier_on(dev);
 		}
@@ -580,6 +582,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
 		}
 
 		rate_control_rate_init(sta);
+		netif_carrier_on(dev);
 	}
 
 	/*