PERFORCE change 119367 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=119367

Change 119367 by sam at sam_ebb on 2007/05/06 20:25:33

	o correct problem where channel change ioctl didn't do anything
	  if new channel was bss chan
	o remove duplicate logic

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#76 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#76 (text+ko) ====

@@ -1677,7 +1677,7 @@
 		if (ic->ic_opmode == IEEE80211_M_HOSTAP &&
 		    !check_mode_consistency(c, ic->ic_des_mode))
 			return EINVAL;
-		if (ic->ic_state == IEEE80211_S_RUN && c == ic->ic_bsschan)
+		if (ic->ic_state == IEEE80211_S_RUN && c == ic->ic_curchan)
 			return 0;	/* NB: nothing to do */
 	}
 	ic->ic_des_chan = c;
@@ -1763,12 +1763,6 @@
 		default:		/* NB: no static turboG */
 			break;
 		}
-		if (ic->ic_opmode == IEEE80211_M_HOSTAP &&
-		    !check_mode_consistency(c, ic->ic_des_mode))
-			return EINVAL;
-		ic->ic_des_chan = c;
-		if (ic->ic_state == IEEE80211_S_RUN && c == ic->ic_bsschan)
-			return 0;	/* NB: nothing to do */
 	}
 	return setcurchan(ic, c);
 }