28c28
< __FBSDID("$FreeBSD: head/sys/net80211/ieee80211_ioctl.c 190384 2009-03-24 17:57:48Z sam $");
---
> __FBSDID("$FreeBSD: head/sys/net80211/ieee80211_ioctl.c 190391 2009-03-24 20:39:08Z sam $");
587,601d586
< /*
< * Return the current ``state'' of an Atheros capbility.
< * If associated in station mode report the negotiated
< * setting. Otherwise report the current setting.
< */
< static int
< getathcap(struct ieee80211vap *vap, int cap)
< {
< if (vap->iv_opmode == IEEE80211_M_STA &&
< vap->iv_state == IEEE80211_S_RUN)
< return IEEE80211_ATH_CAP(vap, vap->iv_bss, cap) != 0;
< else
< return (vap->iv_flags & cap) != 0;
< }
<
977,982d961
< case IEEE80211_IOC_FF:
< ireq->i_val = getathcap(vap, IEEE80211_F_FF);
< break;
< case IEEE80211_IOC_TURBOP:
< ireq->i_val = getathcap(vap, IEEE80211_F_TURBOP);
< break;
2892,2909d2870
< case IEEE80211_IOC_FF:
< if (ireq->i_val) {
< if ((vap->iv_caps & IEEE80211_C_FF) == 0)
< return EOPNOTSUPP;
< vap->iv_flags |= IEEE80211_F_FF;
< } else
< vap->iv_flags &= ~IEEE80211_F_FF;
< error = ERESTART;
< break;
< case IEEE80211_IOC_TURBOP:
< if (ireq->i_val) {
< if ((vap->iv_caps & IEEE80211_C_TURBOP) == 0)
< return EOPNOTSUPP;
< vap->iv_flags |= IEEE80211_F_TURBOP;
< } else
< vap->iv_flags &= ~IEEE80211_F_TURBOP;
< error = ENETRESET;
< break;