in the SIOCG80211ALLNODES ioctl case,
the proper type for i should be size_t,
also give it a nicer name and remove a tab.
ok?
(benno_net80211_use_sizet_in_ioctl.diff)
diff --git sys/net80211/ieee80211_ioctl.c sys/net80211/ieee80211_ioctl.c
index b41b4fe09d8..6aebb432522 100644
--- sys/net80211/ieee80211_ioctl.c
+++ sys/net80211/ieee80211_ioctl.c
@@ -175,7 +175,7 @@ ieee80211_disable_wep(struct ieee80211com *ic)
{
struct ieee80211_key *k;
int i;
-
+
for (i = 0; i < IEEE80211_WEP_NKID; i++) {
k = &ic->ic_nw_keys[i];
if (k->k_cipher != IEEE80211_CIPHER_NONE)
@@ -390,7 +390,7 @@ ieee80211_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
{
struct ieee80211com *ic = (void *)ifp;
struct ifreq *ifr = (struct ifreq *)data;
- int i, error = 0;
+ int error = 0;
size_t len;
struct ieee80211_nwid nwid;
struct ieee80211_join join;
@@ -811,16 +811,16 @@ ieee80211_ioctl(struct ifnet *ifp, u_long cmd, caddr_t
data)
}
na = (struct ieee80211_nodereq_all *)data;
- na->na_nodes = i = 0;
+ na->na_nodes = len = 0;
ni = RBT_MIN(ieee80211_tree, &ic->ic_tree);
while (ni && na->na_size >=
- i + sizeof(struct ieee80211_nodereq)) {
+ len + sizeof(struct ieee80211_nodereq)) {
ieee80211_node2req(ic, ni, &nrbuf);
- error = copyout(&nrbuf, (caddr_t)na->na_node + i,
+ error = copyout(&nrbuf, (caddr_t)na->na_node + len,
sizeof(struct ieee80211_nodereq));
if (error)
break;
- i += sizeof(struct ieee80211_nodereq);
+ len += sizeof(struct ieee80211_nodereq);
na->na_nodes++;
ni = RBT_NEXT(ieee80211_tree, ni);
}