PERFORCE change 115372 for review

[Sam Leffler]

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

Change 115372 by sam at sam_ebb on 2007/03/05 22:08:12

	IFC

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#68 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_var.h#49 integrate

Differences ...

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

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.51 2006/11/06 13:42:03 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.52 2007/03/05 19:12:25 sam Exp $");
 
 #include "opt_compat.h"
 
@@ -485,7 +485,7 @@
 	struct scanreq req;
 	int error;
 
-	if (ireq->i_len < sizeof(struct scanreq))
+	if (ireq->i_len < sizeof(struct ieee80211req_scan_result))
 		return EFAULT;
 
 	error = 0;

==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#49 (text+ko) ====

@@ -29,7 +29,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/net80211/ieee80211_var.h,v 1.45 2007/01/06 02:56:41 kmacy Exp $
+ * $FreeBSD: src/sys/net80211/ieee80211_var.h,v 1.46 2007/03/05 18:52:35 sam Exp $
  */
 #ifndef _NET80211_IEEE80211_VAR_H_
 #define _NET80211_IEEE80211_VAR_H_
@@ -87,9 +87,9 @@
 #define	IEEE80211_RTS_DEFAULT		IEEE80211_RTS_MAX
 #define	IEEE80211_FRAG_DEFAULT		IEEE80211_FRAG_MAX
 
-#define	IEEE80211_MS_TO_TU(x)	(((x) * 1024) / 1000)
-#define	IEEE80211_TU_TO_MS(x)	(((x) * 1000) / 1024)
-#define	IEEE80211_TU_TO_TICKS(x)(((x) * hz) / 1024)
+#define	IEEE80211_MS_TO_TU(x)	(((x) * 1000) / 1024)
+#define	IEEE80211_TU_TO_MS(x)	(((x) * 1024) / 1000)
+#define	IEEE80211_TU_TO_TICKS(x)(((x) * 1024 * hz) / (1000 * 1000))
 
 struct ieee80211_aclator;
 struct sysctl_ctx_list;