28c28
< __FBSDID("$FreeBSD: head/sys/net80211/ieee80211.c 254082 2013-08-08 05:09:35Z adrian $");
---
> __FBSDID("$FreeBSD: head/sys/net80211/ieee80211.c 254315 2013-08-14 04:24:25Z rpaulo $");
1521d1520
< #define N(a) (sizeof(a) / sizeof(a[0]))
1642c1641
< m = findmedia(htrates, N(htrates), rate);
---
> m = findmedia(htrates, nitems(htrates), rate);
1650c1649
< m = findmedia(htrates, N(htrates), rate);
---
> m = findmedia(htrates, nitems(htrates), rate);
1663c1662,1663
< return findmedia(rates, N(rates), rate | IFM_IEEE80211_11A);
---
> return findmedia(rates, nitems(rates),
> rate | IFM_IEEE80211_11A);
1665c1665,1666
< return findmedia(rates, N(rates), rate | IFM_IEEE80211_11B);
---
> return findmedia(rates, nitems(rates),
> rate | IFM_IEEE80211_11B);
1667c1668,1669
< return findmedia(rates, N(rates), rate | IFM_IEEE80211_FH);
---
> return findmedia(rates, nitems(rates),
> rate | IFM_IEEE80211_FH);
1671c1673
< return findmedia(rates, N(rates),
---
> return findmedia(rates, nitems(rates),
1678c1680
< return findmedia(rates, N(rates), rate | IFM_IEEE80211_11G);
---
> return findmedia(rates, nitems(rates), rate | IFM_IEEE80211_11G);
1681d1682
< #undef N
1687d1687
< #define N(a) (sizeof(a) / sizeof(a[0]))
1715c1715
< return IFM_SUBTYPE(mword) < N(ieeerates) ?
---
> return IFM_SUBTYPE(mword) < nitems(ieeerates) ?
1717d1716
< #undef N