Page MenuHomeFreeBSD
Differential D20442

net/bredbandskollen: fix build with GCC-based architectures, fix pkg-descr
ClosedPublic
Actions

Authored by pkubaj on May 28 2019, 2:32 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Mar 1, 1:55 PM
Unknown Object (File)
Feb 24 2025, 5:35 PM
Unknown Object (File)
Feb 23 2025, 7:50 PM
Unknown Object (File)
Feb 23 2025, 4:43 PM
Unknown Object (File)
Feb 21 2025, 5:37 PM
Unknown Object (File)
Jan 14 2025, 10:05 PM
Unknown Object (File)
Dec 5 2024, 2:59 PM
Unknown Object (File)
Nov 17 2024, 12:03 PM
View All 66 Files
Subscribers
None

Details

Reviewers
linimon
mat
tcberner
Commits
rP502934: net/bredbandskollen: fix build with GCC-based architectures, fix pkg-descr
Summary

This port needs USES=compiler:c++11-lang to build on GCC architectures. It also specifies directly CXX with =, replace that with ?=.

Add missing includes (sys/types.h and sys/select.h) that GCC doesn't include by default.

Also fix double https in pkg-descr.

PR: 234216

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

pkubaj created this revision.May 28 2019, 2:32 PM
Harbormaster completed remote builds in B24558: Diff 57992.May 28 2019, 2:32 PM
tcberner accepted this revision.May 29 2019, 4:18 AM

looks good to me

This revision is now accepted and ready to land.May 29 2019, 4:18 AM
Closed by commit rP502934: net/bredbandskollen: fix build with GCC-based architectures, fix pkg-descr (authored by pkubaj). · Explain WhyMay 29 2019, 7:35 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
head/
net/
bredbandskollen/
6 lines
files/
12 lines
13 lines
2 lines

Diff 58026

View Options

head/net/bredbandskollen/Makefile

Show First 20 Lines • Show All 312 Lines • ▼ Show 20 Lines if (ieee80211_radiotap_active(ic)) {
tap->wr_rate = rxs.c_rate; tap->wr_rate = rxs.c_rate;
tap->wr_dbm_antsignal = rssi; tap->wr_dbm_antsignal = rssi;
tap->wr_dbm_antnoise = rxs.c_nf; tap->wr_dbm_antnoise = rxs.c_nf;
} }
/* Drop PHY descriptor. */ /* Drop PHY descriptor. */
m_adj(m, infosz + shift); m_adj(m, infosz + shift);
/* If APPFCS, drop FCS */
if (sc->rcr & R92C_RCR_APPFCS)
m_adj(m, -IEEE80211_CRC_LEN);
return (ni); return (ni);
} }
void void
rtwn_adhoc_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m, int subtype, rtwn_adhoc_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m, int subtype,
const struct ieee80211_rx_stats *rxs, const struct ieee80211_rx_stats *rxs,
int rssi, int nf) int rssi, int nf)
{ {
▲ Show 20 Lines • Show All 122 Lines • ▼ Show 20 Linesrtwn_rxfilter_init(struct rtwn_softc *sc)
/* Reject all data frames. */ /* Reject all data frames. */
rtwn_write_2(sc, R92C_RXFLTMAP2, 0x0000); rtwn_write_2(sc, R92C_RXFLTMAP2, 0x0000);
/* Append generic Rx filter bits. */ /* Append generic Rx filter bits. */
sc->rcr |= R92C_RCR_AM | R92C_RCR_AB | R92C_RCR_APM | sc->rcr |= R92C_RCR_AM | R92C_RCR_AB | R92C_RCR_APM |
R92C_RCR_HTC_LOC_CTRL | R92C_RCR_APP_PHYSTS | R92C_RCR_HTC_LOC_CTRL | R92C_RCR_APP_PHYSTS |
R92C_RCR_APP_ICV | R92C_RCR_APP_MIC; R92C_RCR_APP_ICV | R92C_RCR_APP_MIC;
/*
* Add FCS, to work around occasional 4 byte truncation
* with some frames. This is more problematic on RTL8812/
* RTL8821 because they're also doing L3/L4 checksum offload
* and hardware encryption, so both are tagged as "passed"
* before the frame is truncated.
*/
sc->rcr |= R92C_RCR_APPFCS;
/* Update dynamic Rx filter parts. */ /* Update dynamic Rx filter parts. */
rtwn_rxfilter_update(sc); rtwn_rxfilter_update(sc);
} }
void void
rtwn_rxfilter_set(struct rtwn_softc *sc) rtwn_rxfilter_set(struct rtwn_softc *sc)
{ {
if (!(sc->sc_flags & RTWN_RCR_LOCKED)) if (!(sc->sc_flags & RTWN_RCR_LOCKED))
Show All 15 Lines
rtwn_set_promisc(struct rtwn_softc *sc) rtwn_set_promisc(struct rtwn_softc *sc)
{ {
struct ieee80211com *ic = &sc->sc_ic; struct ieee80211com *ic = &sc->sc_ic;
uint32_t mask_all, mask_min; uint32_t mask_all, mask_min;
RTWN_ASSERT_LOCKED(sc); RTWN_ASSERT_LOCKED(sc);
mask_all = R92C_RCR_ACF | R92C_RCR_ADF | R92C_RCR_AMF | R92C_RCR_AAP; mask_all = R92C_RCR_ACF | R92C_RCR_ADF | R92C_RCR_AMF | R92C_RCR_AAP;
mask_min = R92C_RCR_APM; mask_min = R92C_RCR_APM | R92C_RCR_APPFCS;
if (sc->bcn_vaps == 0) if (sc->bcn_vaps == 0)
mask_min |= R92C_RCR_CBSSID_BCN; mask_min |= R92C_RCR_CBSSID_BCN;
if (sc->ap_vaps == 0) if (sc->ap_vaps == 0)
mask_min |= R92C_RCR_CBSSID_DATA; mask_min |= R92C_RCR_CBSSID_DATA;
if (ic->ic_promisc == 0 && sc->mon_vaps == 0) { if (ic->ic_promisc == 0 && sc->mon_vaps == 0) {
if (sc->bcn_vaps != 0) if (sc->bcn_vaps != 0)
Show All 12 Lines
View Options

head/net/bredbandskollen/files/patch-src_framework_engine.h

Show First 20 Lines • Show All 312 Lines • ▼ Show 20 Lines if (ieee80211_radiotap_active(ic)) {
tap->wr_rate = rxs.c_rate; tap->wr_rate = rxs.c_rate;
tap->wr_dbm_antsignal = rssi; tap->wr_dbm_antsignal = rssi;
tap->wr_dbm_antnoise = rxs.c_nf; tap->wr_dbm_antnoise = rxs.c_nf;
} }
/* Drop PHY descriptor. */ /* Drop PHY descriptor. */
m_adj(m, infosz + shift); m_adj(m, infosz + shift);
/* If APPFCS, drop FCS */
if (sc->rcr & R92C_RCR_APPFCS)
m_adj(m, -IEEE80211_CRC_LEN);
return (ni); return (ni);
} }
void void
rtwn_adhoc_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m, int subtype, rtwn_adhoc_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m, int subtype,
const struct ieee80211_rx_stats *rxs, const struct ieee80211_rx_stats *rxs,
int rssi, int nf) int rssi, int nf)
{ {
▲ Show 20 Lines • Show All 122 Lines • ▼ Show 20 Linesrtwn_rxfilter_init(struct rtwn_softc *sc)
/* Reject all data frames. */ /* Reject all data frames. */
rtwn_write_2(sc, R92C_RXFLTMAP2, 0x0000); rtwn_write_2(sc, R92C_RXFLTMAP2, 0x0000);
/* Append generic Rx filter bits. */ /* Append generic Rx filter bits. */
sc->rcr |= R92C_RCR_AM | R92C_RCR_AB | R92C_RCR_APM | sc->rcr |= R92C_RCR_AM | R92C_RCR_AB | R92C_RCR_APM |
R92C_RCR_HTC_LOC_CTRL | R92C_RCR_APP_PHYSTS | R92C_RCR_HTC_LOC_CTRL | R92C_RCR_APP_PHYSTS |
R92C_RCR_APP_ICV | R92C_RCR_APP_MIC; R92C_RCR_APP_ICV | R92C_RCR_APP_MIC;
/*
* Add FCS, to work around occasional 4 byte truncation
* with some frames. This is more problematic on RTL8812/
* RTL8821 because they're also doing L3/L4 checksum offload
* and hardware encryption, so both are tagged as "passed"
* before the frame is truncated.
*/
sc->rcr |= R92C_RCR_APPFCS;
/* Update dynamic Rx filter parts. */ /* Update dynamic Rx filter parts. */
rtwn_rxfilter_update(sc); rtwn_rxfilter_update(sc);
} }
void void
rtwn_rxfilter_set(struct rtwn_softc *sc) rtwn_rxfilter_set(struct rtwn_softc *sc)
{ {
if (!(sc->sc_flags & RTWN_RCR_LOCKED)) if (!(sc->sc_flags & RTWN_RCR_LOCKED))
Show All 15 Lines
rtwn_set_promisc(struct rtwn_softc *sc) rtwn_set_promisc(struct rtwn_softc *sc)
{ {
struct ieee80211com *ic = &sc->sc_ic; struct ieee80211com *ic = &sc->sc_ic;
uint32_t mask_all, mask_min; uint32_t mask_all, mask_min;
RTWN_ASSERT_LOCKED(sc); RTWN_ASSERT_LOCKED(sc);
mask_all = R92C_RCR_ACF | R92C_RCR_ADF | R92C_RCR_AMF | R92C_RCR_AAP; mask_all = R92C_RCR_ACF | R92C_RCR_ADF | R92C_RCR_AMF | R92C_RCR_AAP;
mask_min = R92C_RCR_APM; mask_min = R92C_RCR_APM | R92C_RCR_APPFCS;
if (sc->bcn_vaps == 0) if (sc->bcn_vaps == 0)
mask_min |= R92C_RCR_CBSSID_BCN; mask_min |= R92C_RCR_CBSSID_BCN;
if (sc->ap_vaps == 0) if (sc->ap_vaps == 0)
mask_min |= R92C_RCR_CBSSID_DATA; mask_min |= R92C_RCR_CBSSID_DATA;
if (ic->ic_promisc == 0 && sc->mon_vaps == 0) { if (ic->ic_promisc == 0 && sc->mon_vaps == 0) {
if (sc->bcn_vaps != 0) if (sc->bcn_vaps != 0)
Show All 12 Lines
View Options

head/net/bredbandskollen/files/patch-src_framework_socketreceiver.h

Show First 20 Lines • Show All 312 Lines • ▼ Show 20 Lines if (ieee80211_radiotap_active(ic)) {
tap->wr_rate = rxs.c_rate; tap->wr_rate = rxs.c_rate;
tap->wr_dbm_antsignal = rssi; tap->wr_dbm_antsignal = rssi;
tap->wr_dbm_antnoise = rxs.c_nf; tap->wr_dbm_antnoise = rxs.c_nf;
} }
/* Drop PHY descriptor. */ /* Drop PHY descriptor. */
m_adj(m, infosz + shift); m_adj(m, infosz + shift);
/* If APPFCS, drop FCS */
if (sc->rcr & R92C_RCR_APPFCS)
m_adj(m, -IEEE80211_CRC_LEN);
return (ni); return (ni);
} }
void void
rtwn_adhoc_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m, int subtype, rtwn_adhoc_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m, int subtype,
const struct ieee80211_rx_stats *rxs, const struct ieee80211_rx_stats *rxs,
int rssi, int nf) int rssi, int nf)
{ {
▲ Show 20 Lines • Show All 122 Lines • ▼ Show 20 Linesrtwn_rxfilter_init(struct rtwn_softc *sc)
/* Reject all data frames. */ /* Reject all data frames. */
rtwn_write_2(sc, R92C_RXFLTMAP2, 0x0000); rtwn_write_2(sc, R92C_RXFLTMAP2, 0x0000);
/* Append generic Rx filter bits. */ /* Append generic Rx filter bits. */
sc->rcr |= R92C_RCR_AM | R92C_RCR_AB | R92C_RCR_APM | sc->rcr |= R92C_RCR_AM | R92C_RCR_AB | R92C_RCR_APM |
R92C_RCR_HTC_LOC_CTRL | R92C_RCR_APP_PHYSTS | R92C_RCR_HTC_LOC_CTRL | R92C_RCR_APP_PHYSTS |
R92C_RCR_APP_ICV | R92C_RCR_APP_MIC; R92C_RCR_APP_ICV | R92C_RCR_APP_MIC;
/*
* Add FCS, to work around occasional 4 byte truncation
* with some frames. This is more problematic on RTL8812/
* RTL8821 because they're also doing L3/L4 checksum offload
* and hardware encryption, so both are tagged as "passed"
* before the frame is truncated.
*/
sc->rcr |= R92C_RCR_APPFCS;
/* Update dynamic Rx filter parts. */ /* Update dynamic Rx filter parts. */
rtwn_rxfilter_update(sc); rtwn_rxfilter_update(sc);
} }
void void
rtwn_rxfilter_set(struct rtwn_softc *sc) rtwn_rxfilter_set(struct rtwn_softc *sc)
{ {
if (!(sc->sc_flags & RTWN_RCR_LOCKED)) if (!(sc->sc_flags & RTWN_RCR_LOCKED))
Show All 15 Lines
rtwn_set_promisc(struct rtwn_softc *sc) rtwn_set_promisc(struct rtwn_softc *sc)
{ {
struct ieee80211com *ic = &sc->sc_ic; struct ieee80211com *ic = &sc->sc_ic;
uint32_t mask_all, mask_min; uint32_t mask_all, mask_min;
RTWN_ASSERT_LOCKED(sc); RTWN_ASSERT_LOCKED(sc);
mask_all = R92C_RCR_ACF | R92C_RCR_ADF | R92C_RCR_AMF | R92C_RCR_AAP; mask_all = R92C_RCR_ACF | R92C_RCR_ADF | R92C_RCR_AMF | R92C_RCR_AAP;
mask_min = R92C_RCR_APM; mask_min = R92C_RCR_APM | R92C_RCR_APPFCS;
if (sc->bcn_vaps == 0) if (sc->bcn_vaps == 0)
mask_min |= R92C_RCR_CBSSID_BCN; mask_min |= R92C_RCR_CBSSID_BCN;
if (sc->ap_vaps == 0) if (sc->ap_vaps == 0)
mask_min |= R92C_RCR_CBSSID_DATA; mask_min |= R92C_RCR_CBSSID_DATA;
if (ic->ic_promisc == 0 && sc->mon_vaps == 0) { if (ic->ic_promisc == 0 && sc->mon_vaps == 0) {
if (sc->bcn_vaps != 0) if (sc->bcn_vaps != 0)
Show All 12 Lines
View Options

head/net/bredbandskollen/pkg-descr

Show First 20 Lines • Show All 312 Lines • ▼ Show 20 Lines if (ieee80211_radiotap_active(ic)) {
tap->wr_rate = rxs.c_rate; tap->wr_rate = rxs.c_rate;
tap->wr_dbm_antsignal = rssi; tap->wr_dbm_antsignal = rssi;
tap->wr_dbm_antnoise = rxs.c_nf; tap->wr_dbm_antnoise = rxs.c_nf;
} }
/* Drop PHY descriptor. */ /* Drop PHY descriptor. */
m_adj(m, infosz + shift); m_adj(m, infosz + shift);
/* If APPFCS, drop FCS */
if (sc->rcr & R92C_RCR_APPFCS)
m_adj(m, -IEEE80211_CRC_LEN);
return (ni); return (ni);
} }
void void
rtwn_adhoc_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m, int subtype, rtwn_adhoc_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m, int subtype,
const struct ieee80211_rx_stats *rxs, const struct ieee80211_rx_stats *rxs,
int rssi, int nf) int rssi, int nf)
{ {
▲ Show 20 Lines • Show All 122 Lines • ▼ Show 20 Linesrtwn_rxfilter_init(struct rtwn_softc *sc)
/* Reject all data frames. */ /* Reject all data frames. */
rtwn_write_2(sc, R92C_RXFLTMAP2, 0x0000); rtwn_write_2(sc, R92C_RXFLTMAP2, 0x0000);
/* Append generic Rx filter bits. */ /* Append generic Rx filter bits. */
sc->rcr |= R92C_RCR_AM | R92C_RCR_AB | R92C_RCR_APM | sc->rcr |= R92C_RCR_AM | R92C_RCR_AB | R92C_RCR_APM |
R92C_RCR_HTC_LOC_CTRL | R92C_RCR_APP_PHYSTS | R92C_RCR_HTC_LOC_CTRL | R92C_RCR_APP_PHYSTS |
R92C_RCR_APP_ICV | R92C_RCR_APP_MIC; R92C_RCR_APP_ICV | R92C_RCR_APP_MIC;
/*
* Add FCS, to work around occasional 4 byte truncation
* with some frames. This is more problematic on RTL8812/
* RTL8821 because they're also doing L3/L4 checksum offload
* and hardware encryption, so both are tagged as "passed"
* before the frame is truncated.
*/
sc->rcr |= R92C_RCR_APPFCS;
/* Update dynamic Rx filter parts. */ /* Update dynamic Rx filter parts. */
rtwn_rxfilter_update(sc); rtwn_rxfilter_update(sc);
} }
void void
rtwn_rxfilter_set(struct rtwn_softc *sc) rtwn_rxfilter_set(struct rtwn_softc *sc)
{ {
if (!(sc->sc_flags & RTWN_RCR_LOCKED)) if (!(sc->sc_flags & RTWN_RCR_LOCKED))
Show All 15 Lines
rtwn_set_promisc(struct rtwn_softc *sc) rtwn_set_promisc(struct rtwn_softc *sc)
{ {
struct ieee80211com *ic = &sc->sc_ic; struct ieee80211com *ic = &sc->sc_ic;
uint32_t mask_all, mask_min; uint32_t mask_all, mask_min;
RTWN_ASSERT_LOCKED(sc); RTWN_ASSERT_LOCKED(sc);
mask_all = R92C_RCR_ACF | R92C_RCR_ADF | R92C_RCR_AMF | R92C_RCR_AAP; mask_all = R92C_RCR_ACF | R92C_RCR_ADF | R92C_RCR_AMF | R92C_RCR_AAP;
mask_min = R92C_RCR_APM; mask_min = R92C_RCR_APM | R92C_RCR_APPFCS;
if (sc->bcn_vaps == 0) if (sc->bcn_vaps == 0)
mask_min |= R92C_RCR_CBSSID_BCN; mask_min |= R92C_RCR_CBSSID_BCN;
if (sc->ap_vaps == 0) if (sc->ap_vaps == 0)
mask_min |= R92C_RCR_CBSSID_DATA; mask_min |= R92C_RCR_CBSSID_DATA;
if (ic->ic_promisc == 0 && sc->mon_vaps == 0) { if (ic->ic_promisc == 0 && sc->mon_vaps == 0) {
if (sc->bcn_vaps != 0) if (sc->bcn_vaps != 0)
Show All 12 Lines