diff options
author | Renato Botelho <renato@netgate.com> | 2016-02-22 14:40:45 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-02-22 14:40:45 -0300 |
commit | 6a0f7868a911546f7be04cc546e99cc803686af3 (patch) | |
tree | f356a9eb233ea7f89db9b9fbba6a2a09aabe65ed | |
parent | ebf7034c8be3fe2fff1d3a2ebe4ef6c3daa40074 (diff) | |
download | FreeBSD-src-6a0f7868a911546f7be04cc546e99cc803686af3.zip FreeBSD-src-6a0f7868a911546f7be04cc546e99cc803686af3.tar.gz |
Revert "Fix the build after net80211HEAD.tgz."
This reverts commit b05262eae8651c5f280c6fadf2e22f70af66d6ca.
-rw-r--r-- | sys/dev/if_ndis/if_ndis.c | 2 | ||||
-rw-r--r-- | sys/modules/ath/Makefile | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/if_ndis/if_ndis.c b/sys/dev/if_ndis/if_ndis.c index 6533f54..eae33c5 100644 --- a/sys/dev/if_ndis/if_ndis.c +++ b/sys/dev/if_ndis/if_ndis.c @@ -3315,7 +3315,7 @@ done: DPRINTF(("scan: bssid %s chan %dMHz (%d/%d) rssi %d\n", ether_sprintf(wb->nwbx_macaddr), freq, sp.bchan, chanflag, rssi)); - ieee80211_add_scan(vap, ic->ic_curchan, &sp, &wh, 0, rssi, noise); + ieee80211_add_scan(vap, &sp, &wh, 0, rssi, noise); wb = (ndis_wlan_bssid_ex *)((char *)wb + wb->nwbx_len); } free(bl, M_DEVBUF); diff --git a/sys/modules/ath/Makefile b/sys/modules/ath/Makefile index 33a1650..c5a40c9 100644 --- a/sys/modules/ath/Makefile +++ b/sys/modules/ath/Makefile @@ -162,7 +162,6 @@ opt_ah.h: CWARNFLAGS.ah_regdomain.c= ${NO_WSHIFT_COUNT_NEGATIVE} ${NO_WSHIFT_COUNT_OVERFLOW} # XXX Work around clang warnings, until maintainer approves fix. CWARNFLAGS.if_ath.c= ${NO_WSOMETIMES_UNINITIALIZED} -CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} # AR9300 HAL build overrides, as there's still some code to tidy up CWARNFLAGS.ar9300_eeprom.c= ${NO_WCONSTANT_CONVERSION} |