diff --git a/[refs] b/[refs]
index 52dd4add45c8..9dc8455730c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e797aa1b7da6bfcb2e19a10ae5ead9aa7aea732b
+refs/heads/master: 58a9ac17ed7a78958d03f3b4af107f0ef075cbed
diff --git a/trunk/net/mac80211/ieee80211_ioctl.c b/trunk/net/mac80211/ieee80211_ioctl.c
index f0224c2311d2..6b4b0d5880db 100644
--- a/trunk/net/mac80211/ieee80211_ioctl.c
+++ b/trunk/net/mac80211/ieee80211_ioctl.c
@@ -306,9 +306,12 @@ int ieee80211_set_channel(struct ieee80211_local *local, int channel, int freq)
 			    ((chan->chan == channel) || (chan->freq == freq))) {
 				local->oper_channel = chan;
 				local->oper_hw_mode = mode;
-				set++;
+				set = 1;
+				break;
 			}
 		}
+		if (set)
+			break;
 	}
 
 	if (set) {