From 1cc0bfd0c1ed2f84bb3e41976c024f0060d60212 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 30 Jul 2012 19:48:09 +0200
Subject: [PATCH] --- yaml --- r: 327642 b: refs/heads/master c:
 1411af156524ce42c2a7f989320c4484257f3ff5 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/mac80211/iface.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a0a06806c6ff..fe22a5d4a025 100644
--- 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
index c65a03ba809f..2d6ac78971ea 100644
--- 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);
 	}
 
 	/*