34c34
< __FBSDID("$FreeBSD: head/sys/net80211/ieee80211.c 148936 2005-08-10 16:22:30Z sam $");
---
> __FBSDID("$FreeBSD: head/sys/net80211/ieee80211.c 152450 2005-11-15 05:56:32Z sam $");
236c236
< u_int
---
> int
238a239
> #define IS_CHAN_IN_PUBLIC_SAFETY_BAND(_c) ((_c) > 4940 && (_c) < 4990)
243c244
< return (freq - 2407) / 5;
---
> return ((int) freq - 2407) / 5;
247c248,254
< return (freq - 5000) / 5;
---
> if (IS_CHAN_IN_PUBLIC_SAFETY_BAND(freq))
> return ((freq * 10) +
> (((freq % 5) == 2) ? 5 : 0) - 49400) / 5;
> if (freq <= 5000)
> return (freq - 4000) / 5;
> else
> return (freq - 5000) / 5;
252,254c259,268
< return (freq - 2407) / 5;
< if (freq < 5000)
< return 15 + ((freq - 2512) / 20);
---
> return ((int) freq - 2407) / 5;
> if (freq < 5000) {
> if (IS_CHAN_IN_PUBLIC_SAFETY_BAND(freq))
> return ((freq * 10) +
> (((freq % 5) == 2) ? 5 : 0) - 49400)/5;
> else if (freq > 4900)
> return (freq - 4000) / 5;
> else
> return 15 + ((freq - 2512) / 20);
> }
256a271
> #undef IS_CHAN_IN_PUBLIC_SAFETY_BAND
262c277
< u_int
---
> int