svn commit: r193851 - projects/mesh11s/sys/net80211
Rui Paulo
rpaulo at FreeBSD.org
Tue Jun 9 19:51:35 UTC 2009
Author: rpaulo
Date: Tue Jun 9 19:51:34 2009
New Revision: 193851
URL: http://svn.freebsd.org/changeset/base/193851
Log:
Remove dead code.
Follow ioctl.c style.
We don't use any congestion signalling, so mark it as null.
Sponsored by: The FreeBSD Foundation
Modified:
projects/mesh11s/sys/net80211/ieee80211_mesh.c
Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c Tue Jun 9 19:51:22 2009 (r193850)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Tue Jun 9 19:51:34 2009 (r193851)
@@ -717,13 +717,6 @@ mesh_recv_action(struct ieee80211_node *
vap->iv_stats.is_rx_mgtdiscard++;
return;
}
-#ifdef notyet
- if (!(meshconf->conf_cap & IEEE80211_MESHCONF_CAP_AP)) {
- IEEE80211_DISCARD(vap,
- IEEE80211_MSG_MESH,
- wh, NULL, "%s", "neighbor not accepting peers");
- }
-#endif
switch (ia->ia_action) {
case IEEE80211_ACTION_MESHPEERING_OPEN:
IEEE80211_NOTE(vap,
@@ -1124,7 +1117,7 @@ ieee80211_add_meshconf(uint8_t *frm, str
.conf_ver = IEEE80211_MESHCONF_VERSION,
.conf_pselid = IEEE80211_MESHCONF_HWMP,
.conf_pmetid = IEEE80211_MESHCONF_AIRTIME,
- .conf_ccid = IEEE80211_MESHCONF_CCSIG,
+ .conf_ccid = IEEE80211_MESHCONF_NULL,
.conf_syncid = IEEE80211_MESHCONF_NULL,
.conf_authid = IEEE80211_MESHCONF_NULL,
/* NB: set below */
@@ -1360,10 +1353,10 @@ mesh_ioctl_set80211(struct ieee80211vap
memcpy(vap->iv_meshid, tmpmeshid, ireq->i_len);
break;
case IEEE80211_IOC_MESH_AP:
- ireq->i_val = vap->iv_meshflags & IEEE80211_MFLAGS_AP;
+ ireq->i_val = (vap->iv_meshflags & IEEE80211_MFLAGS_AP) != 0;
break;
case IEEE80211_IOC_MESH_FWRD:
- ireq->i_val = vap->iv_meshflags & IEEE80211_MFLAGS_FWRD;
+ ireq->i_val = (vap->iv_meshflags & IEEE80211_MFLAGS_FWRD) != 0;
break;
default:
return ENOSYS;
More information about the svn-src-projects
mailing list