Thread: [Madwifi-cvs] madwifi/net80211 ieee80211_wireless.c,1.10,1.11
Status: Beta
Brought to you by:
otaku
From: Sam L. <sam...@us...> - 2004-08-18 03:07:59
|
Update of /cvsroot/madwifi/madwifi/net80211 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5162 Modified Files: ieee80211_wireless.c Log Message: cleanup return value handling in ieee80211_ioctl_setparam Sponsored by: Video54 Technologies Index: ieee80211_wireless.c =================================================================== RCS file: /cvsroot/madwifi/madwifi/net80211/ieee80211_wireless.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ieee80211_wireless.c 18 Aug 2004 03:02:34 -0000 1.10 --- ieee80211_wireless.c 18 Aug 2004 03:07:49 -0000 1.11 *************** *** 1273,1277 **** int value = i[1]; /* NB: most values are TYPE_INT */ struct ifreq ifr; ! int retv = EOPNOTSUPP; int j, caps; const struct ieee80211_authenticator *auth; --- 1273,1277 ---- int value = i[1]; /* NB: most values are TYPE_INT */ struct ifreq ifr; ! int retv = 0; int j, caps; const struct ieee80211_authenticator *auth; *************** *** 1343,1347 **** ic->ic_protmode = value; /* NB: if not operating in 11g this can wait */ ! retv = (ic->ic_curmode == IEEE80211_MODE_11G ? ENETRESET : 0); break; case IEEE80211_PARAM_MCASTCIPHER: --- 1343,1348 ---- ic->ic_protmode = value; /* NB: if not operating in 11g this can wait */ ! if (ic->ic_curmode == IEEE80211_MODE_11G) ! retv = ENETRESET; break; case IEEE80211_PARAM_MCASTCIPHER: *************** *** 1350,1354 **** return -EINVAL; rsn->rsn_mcastcipher = value; ! retv = (ic->ic_flags & IEEE80211_F_WPA) ? ENETRESET : 0; break; case IEEE80211_PARAM_MCASTKEYLEN: --- 1351,1356 ---- return -EINVAL; rsn->rsn_mcastcipher = value; ! if (ic->ic_flags & IEEE80211_F_WPA) ! retv = ENETRESET; break; case IEEE80211_PARAM_MCASTKEYLEN: *************** *** 1357,1361 **** /* XXX no way to verify driver capability */ rsn->rsn_mcastkeylen = value; ! retv = (ic->ic_flags & IEEE80211_F_WPA) ? ENETRESET : 0; break; case IEEE80211_PARAM_UCASTCIPHERS: --- 1359,1364 ---- /* XXX no way to verify driver capability */ rsn->rsn_mcastkeylen = value; ! if (ic->ic_flags & IEEE80211_F_WPA) ! retv = ENETRESET; break; case IEEE80211_PARAM_UCASTCIPHERS: *************** *** 1375,1379 **** /* XXX disallow if running as it'll have no effect */ rsn->rsn_ucastcipherset = caps; ! retv = (ic->ic_flags & IEEE80211_F_WPA) ? ENETRESET : 0; break; case IEEE80211_PARAM_UCASTCIPHER: --- 1378,1383 ---- /* XXX disallow if running as it'll have no effect */ rsn->rsn_ucastcipherset = caps; ! if (ic->ic_flags & IEEE80211_F_WPA) ! retv = ENETRESET; break; case IEEE80211_PARAM_UCASTCIPHER: *************** *** 1381,1385 **** return -EINVAL; rsn->rsn_ucastcipher = value; - retv = 0; break; case IEEE80211_PARAM_UCASTKEYLEN: --- 1385,1388 ---- *************** *** 1388,1392 **** /* XXX no way to verify driver capability */ rsn->rsn_ucastkeylen = value; - retv = 0; break; case IEEE80211_PARAM_KEYMGTALGS: --- 1391,1394 ---- *************** *** 1395,1400 **** if (ic->ic_flags & IEEE80211_F_WPA) retv = ENETRESET; - else - retv = 0; break; case IEEE80211_PARAM_RSNCAPS: --- 1397,1400 ---- *************** *** 1403,1408 **** if (ic->ic_flags & IEEE80211_F_WPA) retv = ENETRESET; - else - retv = 0; break; case IEEE80211_PARAM_WPA: --- 1403,1406 ---- *************** *** 1429,1433 **** return -EINVAL; ic->ic_roaming = value; - retv = 0; break; case IEEE80211_PARAM_PRIVACY: --- 1427,1430 ---- *************** *** 1439,1443 **** } else ic->ic_flags &= ~IEEE80211_F_PRIVACY; - retv = 0; /* XXX? */ break; case IEEE80211_PARAM_DROPUNENCRYPTED: --- 1436,1439 ---- *************** *** 1446,1450 **** else ic->ic_flags &= ~IEEE80211_F_DROPUNENC; - retv = 0; break; case IEEE80211_PARAM_COUNTERMEASURES: --- 1442,1445 ---- *************** *** 1455,1463 **** } else ic->ic_flags &= ~IEEE80211_F_COUNTERM; - retv = 0; break; case IEEE80211_PARAM_DRIVER_CAPS: ic->ic_caps = value; /* NB: for testing */ - retv = 0; break; case IEEE80211_PARAM_MACCMD: --- 1450,1456 ---- *************** *** 1487,1491 **** break; } - retv = 0; break; case IEEE80211_PARAM_WME: --- 1480,1483 ---- *************** *** 1496,1500 **** else ic->ic_flags &= ~IEEE80211_F_WME; - retv = 0; break; case IEEE80211_PARAM_HIDESSID: --- 1488,1491 ---- *************** *** 1510,1526 **** else ic->ic_flags &= ~IEEE80211_F_NOBRIDGE; - retv = 0; break; case IEEE80211_PARAM_INACT: ic->ic_inact_run = value / IEEE80211_INACT_WAIT; - retv = 0; break; case IEEE80211_PARAM_INACT_AUTH: ic->ic_inact_auth = value / IEEE80211_INACT_WAIT; - retv = 0; break; case IEEE80211_PARAM_INACT_INIT: ic->ic_inact_init = value / IEEE80211_INACT_WAIT; ! retv = 0; break; } --- 1501,1516 ---- else ic->ic_flags &= ~IEEE80211_F_NOBRIDGE; break; case IEEE80211_PARAM_INACT: ic->ic_inact_run = value / IEEE80211_INACT_WAIT; break; case IEEE80211_PARAM_INACT_AUTH: ic->ic_inact_auth = value / IEEE80211_INACT_WAIT; break; case IEEE80211_PARAM_INACT_INIT: ic->ic_inact_init = value / IEEE80211_INACT_WAIT; ! break; ! default: ! retv = EOPNOTSUPP; break; } |