svn commit: r350885 - head/sys/dev/rtwn/pci
Author: avos
Date: Mon Aug 12 08:01:21 2019
New Revision: 350885
URL: https://svnweb.freebsd.org/changeset/base/350885
Log:
rtwn_pci: add device ID for RTL8192CE.
PR: 239795
Submitted by: James Parsons
MFC after:1 week
Relnotes: yes
Modified:
head/sys/dev/rtwn/pci/rtwn_pci_attach.h
Modified: head/sys/dev/rtwn/pci/rtwn_pci_attach.h
==
--- head/sys/dev/rtwn/pci/rtwn_pci_attach.h Mon Aug 12 05:25:40 2019
(r350884)
+++ head/sys/dev/rtwn/pci/rtwn_pci_attach.h Mon Aug 12 08:01:21 2019
(r350885)
@@ -35,6 +35,7 @@ struct rtwn_pci_ident {
static const struct rtwn_pci_ident rtwn_pci_ident_table[] = {
{ 0x10ec, 0x8176, "Realtek RTL8188CE", RTWN_CHIP_RTL8192CE },
{ 0x10ec, 0x8179, "Realtek RTL8188EE", RTWN_CHIP_RTL8188EE },
+ { 0x10ec, 0x8178, "Realtek RTL8192CE", RTWN_CHIP_RTL8192CE },
{ 0, 0, NULL, RTWN_CHIP_MAX_PCI }
};
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347511 - in stable: 11/sys/dev/iwi 11/sys/dev/otus 11/sys/dev/usb/wlan 12/sys/dev/iwi 12/sys/dev/otus 12/sys/dev/usb/wlan
Author: avos
Date: Sun May 12 12:30:45 2019
New Revision: 347511
URL: https://svnweb.freebsd.org/changeset/base/347511
Log:
MFC r346073:
urtw(4), otus(4), iwi(4): allow to set non-default MAC address via ifconfig(8)
Was tested with Netgear WG111 v3 (RTL8187B, urtw(4)), STA mode.
Modified:
stable/11/sys/dev/iwi/if_iwi.c
stable/11/sys/dev/otus/if_otus.c
stable/11/sys/dev/usb/wlan/if_urtw.c
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/12/sys/dev/iwi/if_iwi.c
stable/12/sys/dev/otus/if_otus.c
stable/12/sys/dev/usb/wlan/if_urtw.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/11/sys/dev/iwi/if_iwi.c
==
--- stable/11/sys/dev/iwi/if_iwi.c Sun May 12 07:56:01 2019
(r347510)
+++ stable/11/sys/dev/iwi/if_iwi.c Sun May 12 12:30:45 2019
(r347511)
@@ -2549,16 +2549,19 @@ static int
iwi_config(struct iwi_softc *sc)
{
struct ieee80211com *ic = &sc->sc_ic;
+ struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
struct iwi_configuration config;
struct iwi_rateset rs;
struct iwi_txpower power;
+ uint8_t *macaddr;
uint32_t data;
int error, i;
IWI_LOCK_ASSERT(sc);
- DPRINTF(("Setting MAC address to %6D\n", ic->ic_macaddr, ":"));
- error = iwi_cmd(sc, IWI_CMD_SET_MAC_ADDRESS, ic->ic_macaddr,
+ macaddr = vap ? vap->iv_myaddr : ic->ic_macaddr;
+ DPRINTF(("Setting MAC address to %6D\n", macaddr, ":"));
+ error = iwi_cmd(sc, IWI_CMD_SET_MAC_ADDRESS, macaddr,
IEEE80211_ADDR_LEN);
if (error != 0)
return error;
Modified: stable/11/sys/dev/otus/if_otus.c
==
--- stable/11/sys/dev/otus/if_otus.cSun May 12 07:56:01 2019
(r347510)
+++ stable/11/sys/dev/otus/if_otus.cSun May 12 12:30:45 2019
(r347511)
@@ -3095,7 +3095,7 @@ otus_set_operating_mode(struct otus_softc *sc)
*/
IEEE80211_ADDR_COPY(bssid, zero_macaddr);
vap = TAILQ_FIRST(&ic->ic_vaps);
- macaddr = ic->ic_macaddr;
+ macaddr = vap ? vap->iv_myaddr : ic->ic_macaddr;
switch (ic->ic_opmode) {
case IEEE80211_M_STA:
Modified: stable/11/sys/dev/usb/wlan/if_urtw.c
==
--- stable/11/sys/dev/usb/wlan/if_urtw.cSun May 12 07:56:01 2019
(r347510)
+++ stable/11/sys/dev/usb/wlan/if_urtw.cSun May 12 12:30:45 2019
(r347511)
@@ -744,6 +744,7 @@ static void urtw_free_tx_data_list(struct
urtw_softc
static voidurtw_free_rx_data_list(struct urtw_softc *);
static voidurtw_free_data_list(struct urtw_softc *,
struct urtw_data data[], int, int);
+static usb_error_t urtw_set_macaddr(struct urtw_softc *, const uint8_t *);
static usb_error_t urtw_adapter_start(struct urtw_softc *);
static usb_error_t urtw_adapter_start_b(struct urtw_softc *);
static usb_error_t urtw_set_mode(struct urtw_softc *, uint32_t);
@@ -1179,9 +1180,23 @@ fail:
}
static usb_error_t
+urtw_set_macaddr(struct urtw_softc *sc, const uint8_t *macaddr)
+{
+ usb_error_t error;
+
+ urtw_write32_m(sc, URTW_MAC0, ((const uint32_t *)macaddr)[0]);
+ urtw_write16_m(sc, URTW_MAC4, ((const uint32_t *)macaddr)[1] & 0x);
+
+fail:
+ return (error);
+}
+
+static usb_error_t
urtw_adapter_start(struct urtw_softc *sc)
{
struct ieee80211com *ic = &sc->sc_ic;
+ struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
+ const uint8_t *macaddr;
usb_error_t error;
error = urtw_reset(sc);
@@ -1201,8 +1216,11 @@ urtw_adapter_start(struct urtw_softc *sc)
if (error)
goto fail;
/* applying MAC address again. */
- urtw_write32_m(sc, URTW_MAC0, ((uint32_t *)ic->ic_macaddr)[0]);
- urtw_write16_m(sc, URTW_MAC4, ((uint32_t *)ic->ic_macaddr)[1] & 0x);
+ macaddr = vap ? vap->iv_myaddr : ic->ic_macaddr;
+ urtw_set_macaddr(sc, macaddr);
+ if (error)
+ goto fail;
+
error = urtw_set_mode(sc, URTW_EPROM_CMD_NORMAL);
if (error)
goto fail;
@@ -3185,6 +3203,8 @@ static usb_error_t
urtw_8225v2b_rf_init(struct urtw_softc *sc)
{
struct ieee80211com *ic = &sc->sc_ic;
+ struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
+ const uint8_t *macaddr;
unsigned int i;
uint8_t data8;
usb_error_t error;
@@ -3232,8 +3252,10 @@ urtw_8225v2b_rf_init(struct urtw_softc *sc)
urtw_write8_m(sc, URTW_CONFIG1, data8);
/* applying MAC address again. */
- urtw_write32_m(sc, URTW_MAC0, ((uint32_t *)ic->ic_macaddr)[0]);
- urtw_write16_m(sc, URTW_MAC4, ((uint32
svn commit: r347511 - in stable: 11/sys/dev/iwi 11/sys/dev/otus 11/sys/dev/usb/wlan 12/sys/dev/iwi 12/sys/dev/otus 12/sys/dev/usb/wlan
Author: avos
Date: Sun May 12 12:30:45 2019
New Revision: 347511
URL: https://svnweb.freebsd.org/changeset/base/347511
Log:
MFC r346073:
urtw(4), otus(4), iwi(4): allow to set non-default MAC address via ifconfig(8)
Was tested with Netgear WG111 v3 (RTL8187B, urtw(4)), STA mode.
Modified:
stable/12/sys/dev/iwi/if_iwi.c
stable/12/sys/dev/otus/if_otus.c
stable/12/sys/dev/usb/wlan/if_urtw.c
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/sys/dev/iwi/if_iwi.c
stable/11/sys/dev/otus/if_otus.c
stable/11/sys/dev/usb/wlan/if_urtw.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/12/sys/dev/iwi/if_iwi.c
==
--- stable/12/sys/dev/iwi/if_iwi.c Sun May 12 07:56:01 2019
(r347510)
+++ stable/12/sys/dev/iwi/if_iwi.c Sun May 12 12:30:45 2019
(r347511)
@@ -2576,15 +2576,18 @@ static int
iwi_config(struct iwi_softc *sc)
{
struct ieee80211com *ic = &sc->sc_ic;
+ struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
struct iwi_configuration config;
struct iwi_txpower power;
+ uint8_t *macaddr;
uint32_t data;
int error, i;
IWI_LOCK_ASSERT(sc);
- DPRINTF(("Setting MAC address to %6D\n", ic->ic_macaddr, ":"));
- error = iwi_cmd(sc, IWI_CMD_SET_MAC_ADDRESS, ic->ic_macaddr,
+ macaddr = vap ? vap->iv_myaddr : ic->ic_macaddr;
+ DPRINTF(("Setting MAC address to %6D\n", macaddr, ":"));
+ error = iwi_cmd(sc, IWI_CMD_SET_MAC_ADDRESS, macaddr,
IEEE80211_ADDR_LEN);
if (error != 0)
return error;
Modified: stable/12/sys/dev/otus/if_otus.c
==
--- stable/12/sys/dev/otus/if_otus.cSun May 12 07:56:01 2019
(r347510)
+++ stable/12/sys/dev/otus/if_otus.cSun May 12 12:30:45 2019
(r347511)
@@ -3108,7 +3108,7 @@ otus_set_operating_mode(struct otus_softc *sc)
*/
IEEE80211_ADDR_COPY(bssid, zero_macaddr);
vap = TAILQ_FIRST(&ic->ic_vaps);
- macaddr = ic->ic_macaddr;
+ macaddr = vap ? vap->iv_myaddr : ic->ic_macaddr;
switch (ic->ic_opmode) {
case IEEE80211_M_STA:
Modified: stable/12/sys/dev/usb/wlan/if_urtw.c
==
--- stable/12/sys/dev/usb/wlan/if_urtw.cSun May 12 07:56:01 2019
(r347510)
+++ stable/12/sys/dev/usb/wlan/if_urtw.cSun May 12 12:30:45 2019
(r347511)
@@ -752,6 +752,7 @@ static void urtw_free_tx_data_list(struct
urtw_softc
static voidurtw_free_rx_data_list(struct urtw_softc *);
static voidurtw_free_data_list(struct urtw_softc *,
struct urtw_data data[], int, int);
+static usb_error_t urtw_set_macaddr(struct urtw_softc *, const uint8_t *);
static usb_error_t urtw_adapter_start(struct urtw_softc *);
static usb_error_t urtw_adapter_start_b(struct urtw_softc *);
static usb_error_t urtw_set_mode(struct urtw_softc *, uint32_t);
@@ -1187,9 +1188,23 @@ fail:
}
static usb_error_t
+urtw_set_macaddr(struct urtw_softc *sc, const uint8_t *macaddr)
+{
+ usb_error_t error;
+
+ urtw_write32_m(sc, URTW_MAC0, ((const uint32_t *)macaddr)[0]);
+ urtw_write16_m(sc, URTW_MAC4, ((const uint32_t *)macaddr)[1] & 0x);
+
+fail:
+ return (error);
+}
+
+static usb_error_t
urtw_adapter_start(struct urtw_softc *sc)
{
struct ieee80211com *ic = &sc->sc_ic;
+ struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
+ const uint8_t *macaddr;
usb_error_t error;
error = urtw_reset(sc);
@@ -1209,8 +1224,11 @@ urtw_adapter_start(struct urtw_softc *sc)
if (error)
goto fail;
/* applying MAC address again. */
- urtw_write32_m(sc, URTW_MAC0, ((uint32_t *)ic->ic_macaddr)[0]);
- urtw_write16_m(sc, URTW_MAC4, ((uint32_t *)ic->ic_macaddr)[1] & 0x);
+ macaddr = vap ? vap->iv_myaddr : ic->ic_macaddr;
+ urtw_set_macaddr(sc, macaddr);
+ if (error)
+ goto fail;
+
error = urtw_set_mode(sc, URTW_EPROM_CMD_NORMAL);
if (error)
goto fail;
@@ -3180,6 +3198,8 @@ static usb_error_t
urtw_8225v2b_rf_init(struct urtw_softc *sc)
{
struct ieee80211com *ic = &sc->sc_ic;
+ struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
+ const uint8_t *macaddr;
unsigned int i;
uint8_t data8;
usb_error_t error;
@@ -3227,8 +3247,10 @@ urtw_8225v2b_rf_init(struct urtw_softc *sc)
urtw_write8_m(sc, URTW_CONFIG1, data8);
/* applying MAC address again. */
- urtw_write32_m(sc, URTW_MAC0, ((uint32_t *)ic->ic_macaddr)[0]);
- urtw_write16_m(sc, URTW_MAC4, ((uint32_t *)ic->ic_macaddr)[1] & 0xfff
svn commit: r301651 - head/sbin/ifconfig
Author: avos
Date: Wed Jun 8 17:21:15 2016
New Revision: 301651
URL: https://svnweb.freebsd.org/changeset/base/301651
Log:
ifconfig: fix wlan creation when unit number is not provided
(was broken after r300738).
Reported by: Yoshihiro Ota , adrian
Tested by:Yoshihiro Ota
Modified:
head/sbin/ifconfig/ifieee80211.c
Modified: head/sbin/ifconfig/ifieee80211.c
==
--- head/sbin/ifconfig/ifieee80211.cWed Jun 8 17:17:03 2016
(r301650)
+++ head/sbin/ifconfig/ifieee80211.cWed Jun 8 17:21:15 2016
(r301651)
@@ -5190,6 +5190,7 @@ static void
wlan_create(int s, struct ifreq *ifr)
{
static const uint8_t zerobssid[IEEE80211_ADDR_LEN];
+ char orig_name[IFNAMSIZ];
if (params.icp_parent[0] == '\0')
errx(1, "must specify a parent device (wlandev) when creating "
@@ -5201,7 +5202,13 @@ wlan_create(int s, struct ifreq *ifr)
if (ioctl(s, SIOCIFCREATE2, ifr) < 0)
err(1, "SIOCIFCREATE2");
+ /* XXX preserve original name for ifclonecreate(). */
+ strlcpy(orig_name, name, sizeof(orig_name));
+ strlcpy(name, ifr->ifr_name, sizeof(name));
+
setdefregdomain(s);
+
+ strlcpy(name, orig_name, sizeof(name));
}
static
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r301692 - in head/sys/modules: bwn bwn_pci siba_bwn
Author: avos Date: Wed Jun 8 20:01:10 2016 New Revision: 301692 URL: https://svnweb.freebsd.org/changeset/base/301692 Log: bwn, bwn_pci, siba_bwn: add missing opt_*.h dependencies. Modified: head/sys/modules/bwn/Makefile head/sys/modules/bwn_pci/Makefile head/sys/modules/siba_bwn/Makefile Modified: head/sys/modules/bwn/Makefile == --- head/sys/modules/bwn/Makefile Wed Jun 8 19:39:44 2016 (r301691) +++ head/sys/modules/bwn/Makefile Wed Jun 8 20:01:10 2016 (r301692) @@ -12,7 +12,7 @@ SRCS+=if_bwn_phy_g.c if_bwn_phy_lp.c SRCS+= if_bwn_phy_n.c # Other -SRCS+= device_if.h bus_if.h pci_if.h +SRCS+= device_if.h bus_if.h pci_if.h opt_bwn.h opt_wlan.h # Uncomment this for the GPL PHY code; this requires the # module be built with BWN_GPL_PHY set in the kernel Modified: head/sys/modules/bwn_pci/Makefile == --- head/sys/modules/bwn_pci/Makefile Wed Jun 8 19:39:44 2016 (r301691) +++ head/sys/modules/bwn_pci/Makefile Wed Jun 8 20:01:10 2016 (r301692) @@ -7,5 +7,6 @@ SRCS= if_bwn_pci.c bwn_mac.c SRCS+= bhnd_bus_if.h bhndb_bus_if.h \ bhndb_if.h bhnd_nvram_map.h SRCS+= device_if.h bus_if.h pci_if.h \ + opt_bwn.h opt_wlan.h opt_global.h .include Modified: head/sys/modules/siba_bwn/Makefile == --- head/sys/modules/siba_bwn/Makefile Wed Jun 8 19:39:44 2016 (r301691) +++ head/sys/modules/siba_bwn/Makefile Wed Jun 8 20:01:10 2016 (r301692) @@ -4,6 +4,6 @@ KMOD= siba_bwn SRCS= siba_core.c siba_bwn.c sibareg.h sibavar.h -SRCS+= device_if.h bus_if.h pci_if.h +SRCS+= device_if.h bus_if.h pci_if.h opt_siba.h .include ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r301694 - head/usr.sbin/bsdinstall/scripts
Author: avos
Date: Wed Jun 8 20:42:35 2016
New Revision: 301694
URL: https://svnweb.freebsd.org/changeset/base/301694
Log:
bsdinstall: add country/regulatory domain configuration dialog.
Allow to setup country and/or regulatory domain before scanning
(since channel list is affected by regulatory restrictions this may
impact scan results).
PR: 182600 (originally)
Differential Revision:https://reviews.freebsd.org/D6325
Modified:
head/usr.sbin/bsdinstall/scripts/wlanconfig
Modified: head/usr.sbin/bsdinstall/scripts/wlanconfig
==
--- head/usr.sbin/bsdinstall/scripts/wlanconfig Wed Jun 8 20:22:25 2016
(r301693)
+++ head/usr.sbin/bsdinstall/scripts/wlanconfig Wed Jun 8 20:42:35 2016
(r301694)
@@ -31,6 +31,7 @@
BSDCFG_SHARE="/usr/share/bsdconfig"
. $BSDCFG_SHARE/common.subr || exit 1
+f_include $BSDCFG_SHARE/dialog.subr
MAIN
@@ -58,40 +59,190 @@ if [ $? -ne 0 -a -z $BSDINSTALL_CONFIGCU
exit 1
fi
-output=$( wpa_cli scan 2>&1 )
-f_dprintf "%s" "$output"
-dialog --backtitle "FreeBSD Installer" --title "Scanning" --ok-label "Skip" \
- --pause "Waiting 5 seconds to scan for wireless networks..." \
- 9 40 5 || exit 1
-
-SCAN_RESULTS=`wpa_cli scan_results`
-NETWORKS=`echo "$SCAN_RESULTS" | awk -F '\t' \
- '/..:..:..:..:..:../ {if (length($5) > 0) printf("\"%s\"\t%s\n", $5, $4);}'
|
- sort | uniq`
-
-if [ -z "$NETWORKS" ]; then
- dialog --backtitle "FreeBSD Installer" --title "Error" \
- --yesno "No wireless networks were found. Rescan?" 0 0 && \
- exec $0 $@
- exit 1
+country_set()
+{
+ local error_str=
+ local iface_up=
+ local ifconfig_args=
+
+ # Setup what was selected
+ # NB: do not change order of arguments (or regdomain will be ignored)
+ if [ ! -z "$2" ]; then
+ ifconfig_args="${ifconfig_args}country $2"
+ fi
+ if [ ! -z "$1" ]; then
+ if [ ! -z "$2" ]; then
+ ifconfig_args="${ifconfig_args} "
+ fi
+ ifconfig_args="${ifconfig_args}regdomain $1"
+ fi
+ if [ -z "$ifconfig_args" ]; then
+ # Nothing to do (everything was skipped)
+ return $SUCCESS
+ fi
+
+ # Regdomain/country cannot be applied while interface is running
+ iface_up=`ifconfig -lu | grep -w $WLAN_IFACE`
+ if [ ! -z "$iface_up" ]; then
+ ifconfig $WLAN_IFACE down
+ fi
+ error_str=`ifconfig $WLAN_IFACE $ifconfig_args 2>&1 | \
+ sed 's/ifconfig: //'`
+ if [ ! -z "$iface_up" ]; then
+ # Restart wpa_supplicant(8) (should not fail).
+ wpa_supplicant -B -i $WLAN_IFACE -c \
+ $BSDINSTALL_TMPETC/wpa_supplicant.conf
+ fi
+ if [ ! -z "$error_str" ]; then
+ dialog --backtitle "FreeBSD Installer" --title "Error" \
+ --yes-label Change --no-label Ignore --yesno \
+ "Error while applying chosen settings ($error_str)" 0 0
+ if [ $? -eq $DIALOG_OK ]; then
+ return $FAILURE # Restart
+ else
+ return $SUCCESS # Skip
+ fi
+ else
+ : > $BSDINSTALL_TMPETC/rc.conf.net.wlan
+ echo create_args_$WLAN_IFACE=\"$ifconfig_args\" >> \
+ $BSDINSTALL_TMPETC/rc.conf.net.wlan
+ fi
+
+ return $SUCCESS
+}
+
+dialog_country_select()
+{
+ local input=
+ local def_item_regdomain=
+ local def_item_country=
+ local regdomains=
+ local countries=
+ local regdomain=
+ local country=
+
+ # Parse available countries/regdomains
+ input=`ifconfig $WLAN_IFACE list countries | sed 's/DEBUG//gi'`
+ regdomains=`echo $input | sed 's/.*domains://' | tr ' ' '\n' | \
+ sort | tr '\n' ' '`
+ countries=`echo $input | sed 's/Country codes://' | \
+ sed 's/Regulatory.*//' | awk '{
+ for (i = 1; i <= NF; i++) {
+ printf "%s", $i
+ if (match($i, "[[:lower:]]"))
+ if (match($(i+1), "[[:lower:]]"))
+ printf "\\ "
+ else
+ printf "\n"
+ else
+ printf " "
+ }
+ }' | sort -k 2 | tr '\n' ' '`
+
+ # Change default cursor position (if required).
+ if [ "$1" != "" ]; then
+ def_item_regdomain="--default-item $1"
+ fi
+ if [ "$2" != "" ]; then
+ def_item_country="--default-item $2"
+ fi
+
+ f_dialog_menu_size height width rows \"Regdomain sel
svn commit: r301722 - head/sys/net80211
Author: avos
Date: Thu Jun 9 08:19:42 2016
New Revision: 301722
URL: https://svnweb.freebsd.org/changeset/base/301722
Log:
net80211: fix duplicate packet counter incrementation.
Remove 'if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);' from raw xmit
and apbridge path; it will be incremented by ieee80211_tx_complete()
after packet transmission.
Noticed by: Imre Vadasz
Modified:
head/sys/net80211/ieee80211_hostap.c
head/sys/net80211/ieee80211_output.c
Modified: head/sys/net80211/ieee80211_hostap.c
==
--- head/sys/net80211/ieee80211_hostap.cThu Jun 9 07:49:20 2016
(r301721)
+++ head/sys/net80211/ieee80211_hostap.cThu Jun 9 08:19:42 2016
(r301722)
@@ -412,8 +412,8 @@ hostap_deliver_data(struct ieee80211vap
ieee80211_free_node(sta);
}
}
- if (mcopy != NULL && ieee80211_vap_xmitpkt(vap, mcopy) == 0)
- if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
+ if (mcopy != NULL)
+ (void) ieee80211_vap_xmitpkt(vap, mcopy);
}
if (m != NULL) {
/*
Modified: head/sys/net80211/ieee80211_output.c
==
--- head/sys/net80211/ieee80211_output.cThu Jun 9 07:49:20 2016
(r301721)
+++ head/sys/net80211/ieee80211_output.cThu Jun 9 08:19:42 2016
(r301722)
@@ -647,7 +647,6 @@ ieee80211_output(struct ifnet *ifp, stru
if (ieee80211_classify(ni, m))
senderr(EIO); /* XXX */
- if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
IEEE80211_NODE_STAT(ni, tx_data);
if (IEEE80211_IS_MULTICAST(wh->i_addr1)) {
IEEE80211_NODE_STAT(ni, tx_mcast);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r301731 - head/sys/net80211
Author: avos
Date: Thu Jun 9 13:42:18 2016
New Revision: 301731
URL: https://svnweb.freebsd.org/changeset/base/301731
Log:
net80211: discard an injected frame if it is smaller than header length.
Do not try to pass such frames; a correct frame cannot be smaller than
(the corresponding) header size.
(for wpi(4) an additional check was added in r289012).
PR: 144987
Modified:
head/sys/net80211/ieee80211_output.c
Modified: head/sys/net80211/ieee80211_output.c
==
--- head/sys/net80211/ieee80211_output.cThu Jun 9 13:36:31 2016
(r301730)
+++ head/sys/net80211/ieee80211_output.cThu Jun 9 13:42:18 2016
(r301731)
@@ -608,6 +608,8 @@ ieee80211_output(struct ifnet *ifp, stru
if ((wh->i_fc[0] & IEEE80211_FC0_VERSION_MASK) !=
IEEE80211_FC0_VERSION_0)
senderr(EIO); /* XXX */
+ if (m->m_pkthdr.len < ieee80211_anyhdrsize(wh))
+ senderr(EIO); /* XXX */
/* locate destination node */
switch (wh->i_fc[1] & IEEE80211_FC1_DIR_MASK) {
@@ -617,8 +619,6 @@ ieee80211_output(struct ifnet *ifp, stru
break;
case IEEE80211_FC1_DIR_TODS:
case IEEE80211_FC1_DIR_DSTODS:
- if (m->m_pkthdr.len < sizeof(struct ieee80211_frame))
- senderr(EIO); /* XXX */
ni = ieee80211_find_txnode(vap, wh->i_addr3);
break;
default:
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r301733 - head/share/man/man4
Author: avos Date: Thu Jun 9 14:18:12 2016 New Revision: 301733 URL: https://svnweb.freebsd.org/changeset/base/301733 Log: rum(4): refresh manpage. Add a note about hardware encryption support (r288633), adhoc-demo mode (r288622) and remove BUGS section (fixed in r288632). Modified: head/share/man/man4/rum.4 Modified: head/share/man/man4/rum.4 == --- head/share/man/man4/rum.4 Thu Jun 9 13:58:31 2016(r301732) +++ head/share/man/man4/rum.4 Thu Jun 9 14:18:12 2016(r301733) @@ -16,7 +16,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 13, 2008 +.Dd June 9, 2016 .Dt RUM 4 .Os .Sh NAME @@ -64,10 +64,14 @@ This chipset uses the MIMO (multiple-inp with multiple antennas to extend the operating range of the adapter and to achieve higher throughput. .Pp +All chips have hardware support for WEP, AES-CCM, TKIP, and Michael +cryptographic operations. +.Pp .Nm supports .Cm station , .Cm adhoc , +.Cm adhoc-demo , .Cm hostap , and .Cm monitor @@ -182,7 +186,3 @@ driver was written by .An Niall O'Higgins Aq Mt nia...@openbsd.org and .An Damien Bergamini Aq Mt dam...@openbsd.org . -.Sh BUGS -Host AP mode doesn't support client power save. -Clients using power save mode will experience -packet loss (disabling power saving on the client will fix this). ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r301748 - head/share/man/man4
Author: avos Date: Thu Jun 9 17:26:54 2016 New Revision: 301748 URL: https://svnweb.freebsd.org/changeset/base/301748 Log: urtwn(4): refresh manpage. Mention URTWN_WITHOUT_UCODE option (r295871), hardware encryption support (r292175), IBSS (r290651) and HOSTAP (r290631) mode support; cleanup CAVEATS section (some 11n support was added in r297175 + add a note about current rate control issues). Modified: head/share/man/man4/urtwn.4 Modified: head/share/man/man4/urtwn.4 == --- head/share/man/man4/urtwn.4 Thu Jun 9 17:10:19 2016(r301747) +++ head/share/man/man4/urtwn.4 Thu Jun 9 17:26:54 2016(r301748) @@ -14,13 +14,15 @@ .\" .\" $FreeBSD$ .\" -.Dd October 15, 2015 +.Dd June 9, 2016 .Dt URTWN 4 .Os .Sh NAME .Nm urtwn .Nd Realtek RTL8188CU/RTL8188RU/RTL8188EU/RTL8192CU USB IEEE 802.11b/g/n wireless network device .Sh SYNOPSIS +.Cd "options URTWN_WITHOUT_UCODE" +.Pp To compile this driver into the kernel, place the following lines in your kernel configuration file: @@ -39,13 +41,6 @@ module at boot time, place the following .Bd -literal -offset indent if_urtwn_load="YES" .Ed -.Pp -In both cases, place the following line in -.Xr loader.conf 5 -to acknowledge the firmware license (see below): -.Bd -literal -offset indent -legal.realtek.license_ack=1 -.Ed .Sh DESCRIPTION The .Nm @@ -64,15 +59,21 @@ The RTL8192CU is a highly integrated mul RF in a single chip. It operates in the 2GHz spectrum only. .Pp -This driver requires the firmware built with the -.Nm urtwnfw -module to work. -For the loaded firmware to be enabled for use the license at -.Pa /usr/share/doc/legal/realtek.LICENSE -must be agreed by adding the following line to -.Xr loader.conf 5 : +All chips have hardware support for WEP, AES-CCM and TKIP encryption. +.Pp +The driver supports +.Cm station , +.Cm adhoc , +.Cm hostap , +and +.Cm monitor +mode operation. +Only one virtual interface may be configured at any time. .Pp -.Dl "legal.realtek.license_ack=1" +This driver may use the firmware built with the +.Nm urtwnfw +module for some additional features +(when URTWN_WITHOUT_UCODE kernel option is not set). .Sh FILES .Bl -tag -width ".Pa /usr/share/doc/legal/realtek.LICENSE" -compact .It Pa /usr/share/doc/legal/realtek.LICENSE @@ -117,6 +118,28 @@ Join a specific BSS network with 64-bit ifconfig wlan create wlandev urtwn0 ssid my_net \e wepmode on wepkey 0x1234567890 weptxkey 1 up .Ed +.Pp +Create an IBSS network with 128-bit WEP encryption on the channel 4: +.Bd -literal -offset indent +ifconfig wlan0 create wlandev urtwn0 wlanmode adhoc ssid my_net \e + wepmode on wepkey 0x01020304050607080910111213 weptxkey 1 \e + channel 4 +.Ed +.Pp +Join/create an 802.11b IBSS network with network name +.Dq Li my_net : +.Bd -literal -offset indent +ifconfig wlan0 create wlandev urtwn0 wlanmode adhoc +ifconfig wlan0 inet 192.168.0.22 netmask 0xff00 ssid my_net \e + mode 11b +.Ed +.Pp +Create an 802.11g host-based access point: +.Bd -literal -offset indent +ifconfig wlan0 create wlandev urtwn0 wlanmode hostap +ifconfig wlan0 inet 192.168.0.10 netmask 0xff00 ssid my_ap \e + mode 11g +.Ed .Sh DIAGNOSTICS .Bl -diag .It "urtwn%d: error %d, could not read firmware %s" @@ -134,6 +157,7 @@ This should not happen. .Xr urtwnfw 4 , .Xr usb 4 , .Xr wlan 4 , +.Xr wlan_amrr 4 , .Xr wlan_ccmp 4 , .Xr wlan_tkip 4 , .Xr wlan_wep 4 , @@ -158,5 +182,9 @@ driver was written by .Sh CAVEATS The .Nm -driver does not support any of the 802.11n capabilities offered by the -adapters. +driver currently does not support A-MPDU 802.11n transmit aggregation. +.Pp +For non-RTL8188EUS chips +.Dq "rate control" +algorithm is absent; this may result in increased packet loss in noisy +networks. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r301762 - head/sys/dev/urtwn
Author: avos
Date: Thu Jun 9 21:19:46 2016
New Revision: 301762
URL: https://svnweb.freebsd.org/changeset/base/301762
Log:
urtwn: reinstall group keys on every device startup.
Since key table is cleared on every device shutdown,
static WEP keys (which are set only once) need to be
reinstalled manually every time when device starts running.
Tested with RTL8188EU, STA (all ciphers) / IBSS (WPA-none) modes.
Modified:
head/sys/dev/urtwn/if_urtwn.c
head/sys/dev/urtwn/if_urtwnvar.h
Modified: head/sys/dev/urtwn/if_urtwn.c
==
--- head/sys/dev/urtwn/if_urtwn.c Thu Jun 9 20:49:26 2016
(r301761)
+++ head/sys/dev/urtwn/if_urtwn.c Thu Jun 9 21:19:46 2016
(r301762)
@@ -373,6 +373,8 @@ static void urtwn_set_chan(struct urtwn
static voidurtwn_iq_calib(struct urtwn_softc *);
static voidurtwn_lc_calib(struct urtwn_softc *);
static voidurtwn_temp_calib(struct urtwn_softc *);
+static voidurtwn_setup_static_keys(struct urtwn_softc *,
+ struct urtwn_vap *);
static int urtwn_init(struct urtwn_softc *);
static voidurtwn_stop(struct urtwn_softc *);
static voidurtwn_abort_xfers(struct urtwn_softc *);
@@ -2340,12 +2342,28 @@ static int
urtwn_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k)
{
struct urtwn_softc *sc = vap->iv_ic->ic_softc;
+ struct urtwn_vap *uvp = URTWN_VAP(vap);
if (k->wk_flags & IEEE80211_KEY_SWCRYPT) {
/* Not for us. */
return (1);
}
+ if (&vap->iv_nw_keys[0] <= k &&
+ k < &vap->iv_nw_keys[IEEE80211_WEP_NKID]) {
+ URTWN_LOCK(sc);
+ uvp->keys[k->wk_keyix] = k;
+ if ((sc->sc_flags & URTWN_RUNNING) == 0) {
+ /*
+* The device was not started;
+* the key will be installed later.
+*/
+ URTWN_UNLOCK(sc);
+ return (1);
+ }
+ URTWN_UNLOCK(sc);
+ }
+
return (!urtwn_cmd_sleepable(sc, k, sizeof(*k), urtwn_key_set_cb));
}
@@ -2353,12 +2371,25 @@ static int
urtwn_key_delete(struct ieee80211vap *vap, const struct ieee80211_key *k)
{
struct urtwn_softc *sc = vap->iv_ic->ic_softc;
+ struct urtwn_vap *uvp = URTWN_VAP(vap);
if (k->wk_flags & IEEE80211_KEY_SWCRYPT) {
/* Not for us. */
return (1);
}
+ if (&vap->iv_nw_keys[0] <= k &&
+ k < &vap->iv_nw_keys[IEEE80211_WEP_NKID]) {
+ URTWN_LOCK(sc);
+ uvp->keys[k->wk_keyix] = NULL;
+ if ((sc->sc_flags & URTWN_RUNNING) == 0) {
+ /* All keys are removed on device reset. */
+ URTWN_UNLOCK(sc);
+ return (1);
+ }
+ URTWN_UNLOCK(sc);
+ }
+
return (!urtwn_cmd_sleepable(sc, k, sizeof(*k), urtwn_key_del_cb));
}
@@ -5230,6 +5261,20 @@ urtwn_temp_calib(struct urtwn_softc *sc)
}
}
+static void
+urtwn_setup_static_keys(struct urtwn_softc *sc, struct urtwn_vap *uvp)
+{
+ int i;
+
+ for (i = 0; i < IEEE80211_WEP_NKID; i++) {
+ const struct ieee80211_key *k = uvp->keys[i];
+ if (k != NULL) {
+ urtwn_cmd_sleepable(sc, k, sizeof(*k),
+ urtwn_key_set_cb);
+ }
+ }
+}
+
static int
urtwn_init(struct urtwn_softc *sc)
{
@@ -5418,12 +5463,6 @@ urtwn_init(struct urtwn_softc *sc)
R92C_SECCFG_TXENC_ENA | R92C_SECCFG_RXDEC_ENA |
R92C_SECCFG_TXBCKEY_DEF | R92C_SECCFG_RXBCKEY_DEF);
- /*
-* Install static keys (if any).
-* Must be called after urtwn_cam_init().
-*/
- ieee80211_runtask(ic, &sc->cmdq_task);
-
/* Enable hardware sequence numbering. */
urtwn_write_1(sc, R92C_HWSEQ_CTRL, R92C_TX_QUEUE_ALL);
@@ -5459,6 +5498,13 @@ urtwn_init(struct urtwn_softc *sc)
sc->sc_flags |= URTWN_RUNNING;
+ /*
+* Install static keys (if any).
+* Must be called after urtwn_cam_init().
+*/
+ if (vap != NULL)
+ urtwn_setup_static_keys(sc, URTWN_VAP(vap));
+
callout_reset(&sc->sc_watchdog_ch, hz, urtwn_watchdog, sc);
fail:
if (usb_err != USB_ERR_NORMAL_COMPLETION)
Modified: head/sys/dev/urtwn/if_urtwnvar.h
==
--- head/sys/dev/urtwn/if_urtwnvar.hThu Jun 9 20:49:26 2016
(r301761)
+++ head/sys/dev/urtwn/if_urtwnvar.hThu Jun 9 21:19:46 2016
(r301762)
@@ -107,6 +107,8 @@ struct urtwn_vap {
struct mbuf *bcn_mbuf;
struct tas
svn commit: r302034 - head/sys/dev/urtwn
Author: avos
Date: Mon Jun 20 22:39:32 2016
New Revision: 302034
URL: https://svnweb.freebsd.org/changeset/base/302034
Log:
urtwn: fix panic on device detach.
Remove frames from active/pending Tx queues and free related node
references when vap is destroyed to prevent various use-after-free
scenarios.
Reported and tested by: Aleksander Alekseev
PR: 208632
Approved by: re (gjb)
Modified:
head/sys/dev/urtwn/if_urtwn.c
Modified: head/sys/dev/urtwn/if_urtwn.c
==
--- head/sys/dev/urtwn/if_urtwn.c Mon Jun 20 22:05:59 2016
(r302033)
+++ head/sys/dev/urtwn/if_urtwn.c Mon Jun 20 22:39:32 2016
(r302034)
@@ -208,6 +208,10 @@ static struct ieee80211vap *urtwn_vap_cr
const uint8_t [IEEE80211_ADDR_LEN],
const uint8_t [IEEE80211_ADDR_LEN]);
static voidurtwn_vap_delete(struct ieee80211vap *);
+static voidurtwn_vap_clear_tx(struct urtwn_softc *,
+ struct ieee80211vap *);
+static voidurtwn_vap_clear_tx_queue(struct urtwn_softc *,
+ urtwn_datahead *, struct ieee80211vap *);
static struct mbuf * urtwn_rx_copy_to_mbuf(struct urtwn_softc *,
struct r92c_rx_stat *, int);
static struct mbuf * urtwn_report_intr(struct usb_xfer *,
@@ -824,8 +828,16 @@ urtwn_vap_delete(struct ieee80211vap *va
struct urtwn_softc *sc = ic->ic_softc;
struct urtwn_vap *uvp = URTWN_VAP(vap);
+ /* Guarantee that nothing will go through this vap. */
+ ieee80211_new_state(vap, IEEE80211_S_INIT, -1);
+ ieee80211_draintask(ic, &vap->iv_nstate_task);
+
+ URTWN_LOCK(sc);
if (uvp->bcn_mbuf != NULL)
m_freem(uvp->bcn_mbuf);
+ /* Cancel any unfinished Tx. */
+ urtwn_vap_clear_tx(sc, vap);
+ URTWN_UNLOCK(sc);
if (vap->iv_opmode == IEEE80211_M_IBSS)
ieee80211_draintask(ic, &uvp->tsf_task_adhoc);
if (URTWN_CHIP_HAS_RATECTL(sc))
@@ -834,6 +846,41 @@ urtwn_vap_delete(struct ieee80211vap *va
free(uvp, M_80211_VAP);
}
+static void
+urtwn_vap_clear_tx(struct urtwn_softc *sc, struct ieee80211vap *vap)
+{
+
+ URTWN_ASSERT_LOCKED(sc);
+
+ urtwn_vap_clear_tx_queue(sc, &sc->sc_tx_active, vap);
+ urtwn_vap_clear_tx_queue(sc, &sc->sc_tx_pending, vap);
+}
+
+static void
+urtwn_vap_clear_tx_queue(struct urtwn_softc *sc, urtwn_datahead *head,
+struct ieee80211vap *vap)
+{
+ struct urtwn_data *dp, *tmp;
+
+ STAILQ_FOREACH_SAFE(dp, head, next, tmp) {
+ if (dp->ni != NULL) {
+ if (dp->ni->ni_vap == vap) {
+ ieee80211_free_node(dp->ni);
+ dp->ni = NULL;
+
+ if (dp->m != NULL) {
+ m_freem(dp->m);
+ dp->m = NULL;
+ }
+
+ STAILQ_REMOVE(head, dp, urtwn_data, next);
+ STAILQ_INSERT_TAIL(&sc->sc_tx_inactive, dp,
+ next);
+ }
+ }
+ }
+}
+
static struct mbuf *
urtwn_rx_copy_to_mbuf(struct urtwn_softc *sc, struct r92c_rx_stat *stat,
int totlen)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302035 - head/sys/dev/rtwn
Author: avos
Date: Mon Jun 20 22:45:19 2016
New Revision: 302035
URL: https://svnweb.freebsd.org/changeset/base/302035
Log:
rtwn: fix Tx processing, add some busdma synchronization.
1) Unload mbuf instead of descriptor in rtwn_tx_done().
2) Add more synchronization for device visible mappings before
touching the memory.
3) Improve watchdog timer logic.
Reported and tested by: mva
Approved by: re (gjb)
Modified:
head/sys/dev/rtwn/if_rtwn.c
Modified: head/sys/dev/rtwn/if_rtwn.c
==
--- head/sys/dev/rtwn/if_rtwn.c Mon Jun 20 22:39:32 2016(r302034)
+++ head/sys/dev/rtwn/if_rtwn.c Mon Jun 20 22:45:19 2016(r302035)
@@ -586,6 +586,9 @@ rtwn_free_rx_list(struct rtwn_softc *sc)
if (rx_ring->desc_dmat != NULL) {
if (rx_ring->desc != NULL) {
+ bus_dmamap_sync(rx_ring->desc_dmat,
+ rx_ring->desc_map,
+ BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
bus_dmamap_unload(rx_ring->desc_dmat,
rx_ring->desc_map);
bus_dmamem_free(rx_ring->desc_dmat, rx_ring->desc,
@@ -600,6 +603,8 @@ rtwn_free_rx_list(struct rtwn_softc *sc)
rx_data = &rx_ring->rx_data[i];
if (rx_data->m != NULL) {
+ bus_dmamap_sync(rx_ring->data_dmat,
+ rx_data->map, BUS_DMASYNC_POSTREAD);
bus_dmamap_unload(rx_ring->data_dmat, rx_data->map);
m_freem(rx_data->m);
rx_data->m = NULL;
@@ -643,6 +648,8 @@ rtwn_alloc_tx_list(struct rtwn_softc *sc
device_printf(sc->sc_dev, "could not load desc DMA map\n");
goto fail;
}
+ bus_dmamap_sync(tx_ring->desc_dmat, tx_ring->desc_map,
+ BUS_DMASYNC_PREWRITE);
error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0,
BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES,
@@ -691,6 +698,8 @@ rtwn_reset_tx_list(struct rtwn_softc *sc
sizeof(desc->nextdescaddr)));
if (tx_data->m != NULL) {
+ bus_dmamap_sync(tx_ring->data_dmat, tx_data->map,
+ BUS_DMASYNC_POSTWRITE);
bus_dmamap_unload(tx_ring->data_dmat, tx_data->map);
m_freem(tx_data->m);
tx_data->m = NULL;
@@ -718,6 +727,8 @@ rtwn_free_tx_list(struct rtwn_softc *sc,
if (tx_ring->desc_dmat != NULL) {
if (tx_ring->desc != NULL) {
+ bus_dmamap_sync(tx_ring->desc_dmat,
+ tx_ring->desc_map, BUS_DMASYNC_POSTWRITE);
bus_dmamap_unload(tx_ring->desc_dmat,
tx_ring->desc_map);
bus_dmamem_free(tx_ring->desc_dmat, tx_ring->desc,
@@ -730,6 +741,8 @@ rtwn_free_tx_list(struct rtwn_softc *sc,
tx_data = &tx_ring->tx_data[i];
if (tx_data->m != NULL) {
+ bus_dmamap_sync(tx_ring->data_dmat, tx_data->map,
+ BUS_DMASYNC_POSTWRITE);
bus_dmamap_unload(tx_ring->data_dmat, tx_data->map);
m_freem(tx_data->m);
tx_data->m = NULL;
@@ -1761,7 +1774,10 @@ rtwn_tx_done(struct rtwn_softc *sc, int
if (le32toh(tx_desc->txdw0) & R92C_TXDW0_OWN)
continue;
- bus_dmamap_unload(tx_ring->desc_dmat, tx_ring->desc_map);
+ /* Unmap and free mbuf. */
+ bus_dmamap_sync(tx_ring->data_dmat, tx_data->map,
+ BUS_DMASYNC_POSTWRITE);
+ bus_dmamap_unload(tx_ring->data_dmat, tx_data->map);
/*
* XXX TODO: figure out whether the transmit succeeded or not.
@@ -1771,8 +1787,10 @@ rtwn_tx_done(struct rtwn_softc *sc, int
tx_data->ni = NULL;
tx_data->m = NULL;
- sc->sc_tx_timer = 0;
- tx_ring->queued--;
+ if (--tx_ring->queued)
+ sc->sc_tx_timer = 5;
+ else
+ sc->sc_tx_timer = 0;
}
if (tx_ring->queued < (RTWN_TX_LIST_COUNT - 1))
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302183 - head/sys/dev/urtwn
Author: avos
Date: Fri Jun 24 23:36:22 2016
New Revision: 302183
URL: https://svnweb.freebsd.org/changeset/base/302183
Log:
urtwn: fix memory leak on device restart
Free data buffers every time when device is stopped, not when
it is detached; they are allocated at the initialization stage.
How-to-reproduce:
1) ifconfig wlan0 create wlandev urtwn0 up
2) vmstat -m | grep USBdev
3) service netif restart
4) vmstat -m | grep USBdev
Also, remove usbd_transfer_drain() call; it is already called by
usbd_transfer_unsetup().
Tested with RTL8188CUS, STA mode.
Approved by: re (marius)
Modified:
head/sys/dev/urtwn/if_urtwn.c
Modified: head/sys/dev/urtwn/if_urtwn.c
==
--- head/sys/dev/urtwn/if_urtwn.c Fri Jun 24 23:22:42 2016
(r302182)
+++ head/sys/dev/urtwn/if_urtwn.c Fri Jun 24 23:36:22 2016
(r302183)
@@ -683,7 +683,6 @@ urtwn_detach(device_t self)
{
struct urtwn_softc *sc = device_get_softc(self);
struct ieee80211com *ic = &sc->sc_ic;
- unsigned int x;
/* Prevent further ioctls. */
URTWN_LOCK(sc);
@@ -698,26 +697,6 @@ urtwn_detach(device_t self)
/* stop all USB transfers */
usbd_transfer_unsetup(sc->sc_xfer, URTWN_N_TRANSFER);
- /* Prevent further allocations from RX/TX data lists. */
- URTWN_LOCK(sc);
- STAILQ_INIT(&sc->sc_tx_active);
- STAILQ_INIT(&sc->sc_tx_inactive);
- STAILQ_INIT(&sc->sc_tx_pending);
-
- STAILQ_INIT(&sc->sc_rx_active);
- STAILQ_INIT(&sc->sc_rx_inactive);
- URTWN_UNLOCK(sc);
-
- /* drain USB transfers */
- for (x = 0; x != URTWN_N_TRANSFER; x++)
- usbd_transfer_drain(sc->sc_xfer[x]);
-
- /* Free data buffers. */
- URTWN_LOCK(sc);
- urtwn_free_tx_list(sc);
- urtwn_free_rx_list(sc);
- URTWN_UNLOCK(sc);
-
if (ic->ic_softc == sc) {
ieee80211_draintask(ic, &sc->cmdq_task);
ieee80211_ifdetach(ic);
@@ -1359,12 +1338,19 @@ static void
urtwn_free_rx_list(struct urtwn_softc *sc)
{
urtwn_free_list(sc, sc->sc_rx, URTWN_RX_LIST_COUNT);
+
+ STAILQ_INIT(&sc->sc_rx_active);
+ STAILQ_INIT(&sc->sc_rx_inactive);
}
static void
urtwn_free_tx_list(struct urtwn_softc *sc)
{
urtwn_free_list(sc, sc->sc_tx, URTWN_TX_LIST_COUNT);
+
+ STAILQ_INIT(&sc->sc_tx_active);
+ STAILQ_INIT(&sc->sc_tx_inactive);
+ STAILQ_INIT(&sc->sc_tx_pending);
}
static void
@@ -5579,6 +5565,8 @@ urtwn_stop(struct urtwn_softc *sc)
urtwn_abort_xfers(sc);
urtwn_drain_mbufq(sc);
+ urtwn_free_tx_list(sc);
+ urtwn_free_rx_list(sc);
urtwn_power_off(sc);
URTWN_UNLOCK(sc);
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302186 - head/sys/dev/urtwn
Author: avos
Date: Fri Jun 24 23:43:19 2016
New Revision: 302186
URL: https://svnweb.freebsd.org/changeset/base/302186
Log:
urtwn: use m_get2() in Rx path.
Replace m_getcl() with m_get2(); this fixes 'frame too long'
messages for frames, which are longer than MCLBYTES
(can be easily triggered when A-MSDU is used).
Tested with RTL8188CUS (AP) and RTL8188EU (STA).
Approved by: re (marius)
Modified:
head/sys/dev/urtwn/if_urtwn.c
Modified: head/sys/dev/urtwn/if_urtwn.c
==
--- head/sys/dev/urtwn/if_urtwn.c Fri Jun 24 23:42:33 2016
(r302185)
+++ head/sys/dev/urtwn/if_urtwn.c Fri Jun 24 23:43:19 2016
(r302186)
@@ -895,14 +895,7 @@ urtwn_rx_copy_to_mbuf(struct urtwn_softc
goto fail;
}
- if (__predict_false(totlen > MCLBYTES)) {
- /* convert to m_getjcl if this happens */
- device_printf(sc->sc_dev, "%s: frame too long: %d (%d)\n",
- __func__, pktlen, totlen);
- goto fail;
- }
-
- m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
+ m = m_get2(totlen, M_NOWAIT, MT_DATA, M_PKTHDR);
if (__predict_false(m == NULL)) {
device_printf(sc->sc_dev, "%s: could not allocate RX mbuf\n",
__func__);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302283 - head/sys/net80211
Author: avos
Date: Wed Jun 29 17:25:46 2016
New Revision: 302283
URL: https://svnweb.freebsd.org/changeset/base/302283
Log:
net80211: fix LOR/deadlock in ieee80211_ff_node_cleanup().
Add new lock for stageq (part of ieee80211_superg structure) and
ni_tx_superg (part of ieee80211_node structure);
drop com_lock protection where it is used to protect them.
While here, drop duplicate OPACKETS counter incrementation.
ni_tx_ampdu is not protected with it (however, it is also used without
locking in other places; probably, it requires some other solution
to be thread-safe).
Tested with RTL8188CUS (AP) and RTL8188EU (STA).
NOTE: Since this change breaks KBI, all wireless drivers need to be
recompiled.
Reviewed by: adrian
Approved by: re (gjb)
Differential Revision:https://reviews.freebsd.org/D6958
Modified:
head/sys/net80211/ieee80211_ddb.c
head/sys/net80211/ieee80211_freebsd.h
head/sys/net80211/ieee80211_superg.c
head/sys/net80211/ieee80211_superg.h
head/sys/net80211/ieee80211_var.h
Modified: head/sys/net80211/ieee80211_ddb.c
==
--- head/sys/net80211/ieee80211_ddb.c Wed Jun 29 16:45:01 2016
(r302282)
+++ head/sys/net80211/ieee80211_ddb.c Wed Jun 29 17:25:46 2016
(r302283)
@@ -506,6 +506,8 @@ _db_show_com(const struct ieee80211com *
db_printf("\tsoftc %p", ic->ic_softc);
db_printf("\tname %s", ic->ic_name);
db_printf(" comlock %p", &ic->ic_comlock);
+ db_printf(" txlock %p", &ic->ic_txlock);
+ db_printf(" fflock %p", &ic->ic_fflock);
db_printf("\n");
db_printf("\theadroom %d", ic->ic_headroom);
db_printf(" phytype %d", ic->ic_phytype);
Modified: head/sys/net80211/ieee80211_freebsd.h
==
--- head/sys/net80211/ieee80211_freebsd.h Wed Jun 29 16:45:01 2016
(r302282)
+++ head/sys/net80211/ieee80211_freebsd.h Wed Jun 29 17:25:46 2016
(r302283)
@@ -83,6 +83,25 @@ typedef struct {
mtx_assert(IEEE80211_TX_LOCK_OBJ(_ic), MA_NOTOWNED)
/*
+ * Stageq / ni_tx_superg lock
+ */
+typedef struct {
+ charname[16]; /* e.g. "ath0_ff_lock" */
+ struct mtx mtx;
+} ieee80211_ff_lock_t;
+#define IEEE80211_FF_LOCK_INIT(_ic, _name) do {
\
+ ieee80211_ff_lock_t *fl = &(_ic)->ic_fflock;\
+ snprintf(fl->name, sizeof(fl->name), "%s_ff_lock", _name); \
+ mtx_init(&fl->mtx, fl->name, NULL, MTX_DEF);\
+} while (0)
+#define IEEE80211_FF_LOCK_OBJ(_ic) (&(_ic)->ic_fflock.mtx)
+#define IEEE80211_FF_LOCK_DESTROY(_ic) mtx_destroy(IEEE80211_FF_LOCK_OBJ(_ic))
+#define IEEE80211_FF_LOCK(_ic) mtx_lock(IEEE80211_FF_LOCK_OBJ(_ic))
+#define IEEE80211_FF_UNLOCK(_ic) mtx_unlock(IEEE80211_FF_LOCK_OBJ(_ic))
+#define IEEE80211_FF_LOCK_ASSERT(_ic) \
+ mtx_assert(IEEE80211_FF_LOCK_OBJ(_ic), MA_OWNED)
+
+/*
* Node locking definitions.
*/
typedef struct {
Modified: head/sys/net80211/ieee80211_superg.c
==
--- head/sys/net80211/ieee80211_superg.cWed Jun 29 16:45:01 2016
(r302282)
+++ head/sys/net80211/ieee80211_superg.cWed Jun 29 17:25:46 2016
(r302283)
@@ -99,6 +99,8 @@ ieee80211_superg_attach(struct ieee80211
{
struct ieee80211_superg *sg;
+ IEEE80211_FF_LOCK_INIT(ic, ic->ic_name);
+
sg = (struct ieee80211_superg *) IEEE80211_MALLOC(
sizeof(struct ieee80211_superg), M_80211_VAP,
IEEE80211_M_NOWAIT | IEEE80211_M_ZERO);
@@ -120,6 +122,8 @@ ieee80211_superg_attach(struct ieee80211
void
ieee80211_superg_detach(struct ieee80211com *ic)
{
+ IEEE80211_FF_LOCK_DESTROY(ic);
+
if (ic->ic_superg != NULL) {
IEEE80211_FREE(ic->ic_superg, M_80211_VAP);
ic->ic_superg = NULL;
@@ -575,19 +579,14 @@ ff_transmit(struct ieee80211_node *ni, s
{
struct ieee80211vap *vap = ni->ni_vap;
struct ieee80211com *ic = ni->ni_ic;
- int error;
- IEEE80211_TX_LOCK_ASSERT(vap->iv_ic);
+ IEEE80211_TX_LOCK_ASSERT(ic);
/* encap and xmit */
m = ieee80211_encap(vap, ni, m);
- if (m != NULL) {
- struct ifnet *ifp = vap->iv_ifp;
-
- error = ieee80211_parent_xmitpkt(ic, m);
- if (!error)
- if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
- } else
+ if (m != NULL)
+ (void) ieee80211_parent_xmitpkt(ic, m);
+ else
ieee80211_free_node(ni);
}
@@ -620,14 +619,6 @@ ff_flush(struct mbuf *head, struct mbuf
/*
* Age frames on the staging queue.
- *
- * This is called without the comlock held, but it does all its work
- * behind the comlock. Bec
svn commit: r303115 - head/sys/dev/urtwn
Author: avos
Date: Wed Jul 20 22:05:44 2016
New Revision: 303115
URL: https://svnweb.freebsd.org/changeset/base/303115
Log:
urtwn: fix A-MSDU tx aggregation when encryption is used.
Clear unused (undocumented) CAM bytes while setting a key;
without that, hardware does weird things when A-MSDU bit in QoS header
is set.
Tested with RTL8188CUS (AP) -> RTL8188EU (STA) (A-MSDU transmit).
Reported by: many
Obtained from:https://github.com/s3erios/urtwm
MFC after:5 days
Modified:
head/sys/dev/urtwn/if_urtwn.c
head/sys/dev/urtwn/if_urtwnreg.h
Modified: head/sys/dev/urtwn/if_urtwn.c
==
--- head/sys/dev/urtwn/if_urtwn.c Wed Jul 20 22:03:45 2016
(r303114)
+++ head/sys/dev/urtwn/if_urtwn.c Wed Jul 20 22:05:44 2016
(r303115)
@@ -2318,6 +2318,10 @@ urtwn_key_set_cb(struct urtwn_softc *sc,
k->wk_cipher->ic_cipher, algo, k->wk_flags, k->wk_keylen,
ether_sprintf(k->wk_macaddr));
+ /* Clear high bits. */
+ urtwn_cam_write(sc, R92C_CAM_CTL6(k->wk_keyix), 0);
+ urtwn_cam_write(sc, R92C_CAM_CTL7(k->wk_keyix), 0);
+
/* Write key. */
for (i = 0; i < 4; i++) {
error = urtwn_cam_write(sc, R92C_CAM_KEY(k->wk_keyix, i),
Modified: head/sys/dev/urtwn/if_urtwnreg.h
==
--- head/sys/dev/urtwn/if_urtwnreg.hWed Jul 20 22:03:45 2016
(r303114)
+++ head/sys/dev/urtwn/if_urtwnreg.hWed Jul 20 22:05:44 2016
(r303115)
@@ -871,6 +871,8 @@
#define R92C_CAM_CTL0(entry) ((entry) * 8 + 0)
#define R92C_CAM_CTL1(entry) ((entry) * 8 + 1)
#define R92C_CAM_KEY(entry, i) ((entry) * 8 + 2 + (i))
+#define R92C_CAM_CTL6(entry) ((entry) * 8 + 6)
+#define R92C_CAM_CTL7(entry) ((entry) * 8 + 7)
/* Bits for R92C_CAM_CTL0(i). */
#define R92C_CAM_KEYID_M 0x0003
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r341753 - stable/11/lib/lib80211
Author: avos Date: Sun Dec 9 05:35:22 2018 New Revision: 341753 URL: https://svnweb.freebsd.org/changeset/base/341753 Log: MFC r316939: [lib80211] fix a missing cleanup path. PR: lib/218655 Reported by: Modified: stable/11/lib/lib80211/lib80211_regdomain.c Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/lib80211/lib80211_regdomain.c == --- stable/11/lib/lib80211/lib80211_regdomain.c Sun Dec 9 04:54:55 2018 (r341752) +++ stable/11/lib/lib80211/lib80211_regdomain.c Sun Dec 9 05:35:22 2018 (r341753) @@ -539,6 +539,7 @@ cleanup_bands(netband_head *head) nb = LIST_FIRST(head); if (nb == NULL) break; + LIST_REMOVE(nb, next); free(nb); } } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r341786 - in head/sys/dev: rtwn/usb usb usb/wlan
Author: avos
Date: Mon Dec 10 09:45:57 2018
New Revision: 341786
URL: https://svnweb.freebsd.org/changeset/base/341786
Log:
rtwn, rsu: add more USB ids.
PR: 233638
Submitted by: cezary.sl...@gmail.com
MFC after:3 days
Modified:
head/sys/dev/rtwn/usb/rtwn_usb_attach.h
head/sys/dev/usb/usbdevs
head/sys/dev/usb/wlan/if_rsu.c
Modified: head/sys/dev/rtwn/usb/rtwn_usb_attach.h
==
--- head/sys/dev/rtwn/usb/rtwn_usb_attach.h Mon Dec 10 09:36:05 2018
(r341785)
+++ head/sys/dev/rtwn/usb/rtwn_usb_attach.h Mon Dec 10 09:45:57 2018
(r341786)
@@ -118,6 +118,7 @@ static const STRUCT_USB_HOST_ID rtwn_devs[] = {
RTWN_RTL8188EU_DEV(DLINK, DWA123D1),
RTWN_RTL8188EU_DEV(DLINK, DWA125D1),
RTWN_RTL8188EU_DEV(ELECOM, WDC150SU2M),
+ RTWN_RTL8188EU_DEV(TPLINK, WN722N),
RTWN_RTL8188EU_DEV(REALTEK, RTL8188ETV),
RTWN_RTL8188EU_DEV(REALTEK, RTL8188EU),
#undef RTWN_RTL8188EU_DEV
Modified: head/sys/dev/usb/usbdevs
==
--- head/sys/dev/usb/usbdevsMon Dec 10 09:36:05 2018(r341785)
+++ head/sys/dev/usb/usbdevsMon Dec 10 09:45:57 2018(r341786)
@@ -4346,6 +4346,7 @@ product SITECOMEU RT3072_40x0048 RT3072
product SITECOMEU RT3072_5 0x004a RT3072
product SITECOMEU WL349V1 0x004b WL-349 v1
product SITECOMEU RT3072_6 0x004d RT3072
+product SITECOMEU WLA1000 0x005b WLA-1000
product SITECOMEU RTL8188CU_1 0x0052 RTL8188CU
product SITECOMEU RTL8188CU_2 0x005c RTL8188CU
product SITECOMEU RTL8192CU0x0061 RTL8192CU
@@ -4611,6 +4612,7 @@ product TOSHIBA TRANSMEMORY 0x6545 USB ThumbDrive
product TPLINK T4U 0x0101 Archer T4U
product TPLINK WN822NV40x0108 TL-WN822N v4
product TPLINK WN823NV20x0109 TL-WN823N v2
+product TPLINK WN722N 0x010c TL-WN722N
product TPLINK T4UV2 0x010d Archer T4U ver 2
product TPLINK T4UHV2 0x010e Archer T4UH ver 2
product TPLINK RTL8153 0x0601 RTL8153 USB 10/100/1000 LAN
Modified: head/sys/dev/usb/wlan/if_rsu.c
==
--- head/sys/dev/usb/wlan/if_rsu.c Mon Dec 10 09:36:05 2018
(r341785)
+++ head/sys/dev/usb/wlan/if_rsu.c Mon Dec 10 09:45:57 2018
(r341786)
@@ -114,6 +114,7 @@ static const STRUCT_USB_HOST_ID rsu_devs[] = {
RSU_HT_NOT_SUPPORTED) }
RSU_DEV(ASUS, RTL8192SU),
RSU_DEV(AZUREWAVE, RTL8192SU_4),
+ RSU_DEV(SITECOMEU, WLA1000),
RSU_DEV_HT(ACCTON, RTL8192SU),
RSU_DEV_HT(ASUS,USBN10),
RSU_DEV_HT(AZUREWAVE, RTL8192SU_1),
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r342124 - in head/sys/dev: rtwn/usb usb
Author: avos
Date: Sat Dec 15 14:58:45 2018
New Revision: 342124
URL: https://svnweb.freebsd.org/changeset/base/342124
Log:
Add new USB id in rtwn_usb(4) (RTL8812AU)
PR: 234029
Submitted by:
MFC after:4 days
Modified:
head/sys/dev/rtwn/usb/rtwn_usb_attach.h
head/sys/dev/usb/usbdevs
Modified: head/sys/dev/rtwn/usb/rtwn_usb_attach.h
==
--- head/sys/dev/rtwn/usb/rtwn_usb_attach.h Sat Dec 15 14:08:41 2018
(r342123)
+++ head/sys/dev/rtwn/usb/rtwn_usb_attach.h Sat Dec 15 14:58:45 2018
(r342124)
@@ -140,6 +140,7 @@ static const STRUCT_USB_HOST_ID rtwn_devs[] = {
RTWN_RTL8812AU_DEV(SITECOMEU, WLA7100),
RTWN_RTL8812AU_DEV(TPLINK, T4U),
RTWN_RTL8812AU_DEV(TPLINK, T4UV2),
+ RTWN_RTL8812AU_DEV(TPLINK, T4UHV1),
RTWN_RTL8812AU_DEV(TPLINK, T4UHV2),
RTWN_RTL8812AU_DEV(TRENDNET,TEW805UB),
RTWN_RTL8812AU_DEV(ZYXEL, NWD6605),
Modified: head/sys/dev/usb/usbdevs
==
--- head/sys/dev/usb/usbdevsSat Dec 15 14:08:41 2018(r342123)
+++ head/sys/dev/usb/usbdevsSat Dec 15 14:58:45 2018(r342124)
@@ -4614,6 +4614,7 @@ product TPLINK WN822NV4 0x0108 TL-WN822N v4
product TPLINK WN823NV20x0109 TL-WN823N v2
product TPLINK WN722N 0x010c TL-WN722N
product TPLINK T4UV2 0x010d Archer T4U ver 2
+product TPLINK T4UHV1 0x0103 Archer T4UH ver 1
product TPLINK T4UHV2 0x010e Archer T4UH ver 2
product TPLINK RTL8153 0x0601 RTL8153 USB 10/100/1000 LAN
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r342156 - in head/sys/dev: rtwn/usb usb
Author: avos
Date: Mon Dec 17 05:07:57 2018
New Revision: 342156
URL: https://svnweb.freebsd.org/changeset/base/342156
Log:
Add revision number for TP-Link TL-WN722N to prevent ambiguity between
different chipsets.
MFC after:3 days
X-MFC with: 341786
Modified:
head/sys/dev/rtwn/usb/rtwn_usb_attach.h
head/sys/dev/usb/usbdevs
Modified: head/sys/dev/rtwn/usb/rtwn_usb_attach.h
==
--- head/sys/dev/rtwn/usb/rtwn_usb_attach.h Mon Dec 17 00:32:50 2018
(r342155)
+++ head/sys/dev/rtwn/usb/rtwn_usb_attach.h Mon Dec 17 05:07:57 2018
(r342156)
@@ -118,7 +118,7 @@ static const STRUCT_USB_HOST_ID rtwn_devs[] = {
RTWN_RTL8188EU_DEV(DLINK, DWA123D1),
RTWN_RTL8188EU_DEV(DLINK, DWA125D1),
RTWN_RTL8188EU_DEV(ELECOM, WDC150SU2M),
- RTWN_RTL8188EU_DEV(TPLINK, WN722N),
+ RTWN_RTL8188EU_DEV(TPLINK, WN722NV2),
RTWN_RTL8188EU_DEV(REALTEK, RTL8188ETV),
RTWN_RTL8188EU_DEV(REALTEK, RTL8188EU),
#undef RTWN_RTL8188EU_DEV
Modified: head/sys/dev/usb/usbdevs
==
--- head/sys/dev/usb/usbdevsMon Dec 17 00:32:50 2018(r342155)
+++ head/sys/dev/usb/usbdevsMon Dec 17 05:07:57 2018(r342156)
@@ -4612,7 +4612,7 @@ product TOSHIBA TRANSMEMORY 0x6545 USB ThumbDrive
product TPLINK T4U 0x0101 Archer T4U
product TPLINK WN822NV40x0108 TL-WN822N v4
product TPLINK WN823NV20x0109 TL-WN823N v2
-product TPLINK WN722N 0x010c TL-WN722N
+product TPLINK WN722NV20x010c TL-WN722N v2
product TPLINK T4UV2 0x010d Archer T4U ver 2
product TPLINK T4UHV1 0x0103 Archer T4UH ver 1
product TPLINK T4UHV2 0x010e Archer T4UH ver 2
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r342185 - head/sys/dev/iwi
Author: avos
Date: Tue Dec 18 05:08:56 2018
New Revision: 342185
URL: https://svnweb.freebsd.org/changeset/base/342185
Log:
iwi(4): do not leak node reference when IWI_FLAG_ASSOCIATED flag is set.
MFC after:6 days
Modified:
head/sys/dev/iwi/if_iwi.c
Modified: head/sys/dev/iwi/if_iwi.c
==
--- head/sys/dev/iwi/if_iwi.c Tue Dec 18 03:00:12 2018(r342184)
+++ head/sys/dev/iwi/if_iwi.c Tue Dec 18 05:08:56 2018(r342185)
@@ -2833,12 +2833,12 @@ iwi_auth_and_assoc(struct iwi_softc *sc, struct ieee80
IWI_LOCK_ASSERT(sc);
- ni = ieee80211_ref_node(vap->iv_bss);
-
if (sc->flags & IWI_FLAG_ASSOCIATED) {
DPRINTF(("Already associated\n"));
return (-1);
}
+
+ ni = ieee80211_ref_node(vap->iv_bss);
IWI_STATE_BEGIN(sc, IWI_FW_ASSOCIATING);
error = 0;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r342209 - in stable/12/sys/dev: rtwn/usb usb
Author: avos
Date: Wed Dec 19 02:23:51 2018
New Revision: 342209
URL: https://svnweb.freebsd.org/changeset/base/342209
Log:
MFC r342124:
Add new USB id in rtwn_usb(4) (RTL8812AU)
PR: 234029
Submitted by:
Modified:
stable/12/sys/dev/rtwn/usb/rtwn_usb_attach.h
stable/12/sys/dev/usb/usbdevs
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/dev/rtwn/usb/rtwn_usb_attach.h
==
--- stable/12/sys/dev/rtwn/usb/rtwn_usb_attach.hWed Dec 19 01:37:00
2018(r342208)
+++ stable/12/sys/dev/rtwn/usb/rtwn_usb_attach.hWed Dec 19 02:23:51
2018(r342209)
@@ -139,6 +139,7 @@ static const STRUCT_USB_HOST_ID rtwn_devs[] = {
RTWN_RTL8812AU_DEV(SITECOMEU, WLA7100),
RTWN_RTL8812AU_DEV(TPLINK, T4U),
RTWN_RTL8812AU_DEV(TPLINK, T4UV2),
+ RTWN_RTL8812AU_DEV(TPLINK, T4UHV1),
RTWN_RTL8812AU_DEV(TPLINK, T4UHV2),
RTWN_RTL8812AU_DEV(TRENDNET,TEW805UB),
RTWN_RTL8812AU_DEV(ZYXEL, NWD6605),
Modified: stable/12/sys/dev/usb/usbdevs
==
--- stable/12/sys/dev/usb/usbdevs Wed Dec 19 01:37:00 2018
(r342208)
+++ stable/12/sys/dev/usb/usbdevs Wed Dec 19 02:23:51 2018
(r342209)
@@ -4610,6 +4610,7 @@ product TPLINK T4U0x0101 Archer T4U
product TPLINK WN822NV40x0108 TL-WN822N v4
product TPLINK WN823NV20x0109 TL-WN823N v2
product TPLINK T4UV2 0x010d Archer T4U ver 2
+product TPLINK T4UHV1 0x0103 Archer T4UH ver 1
product TPLINK T4UHV2 0x010e Archer T4UH ver 2
product TPLINK RTL8153 0x0601 RTL8153 USB 10/100/1000 LAN
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r342211 - head/sys/net80211
Author: avos Date: Wed Dec 19 03:08:10 2018 New Revision: 342211 URL: https://svnweb.freebsd.org/changeset/base/342211 Log: net80211: fix out-of-bounds read in ieee80211_amrr(9). ieee80211_alloc_node() does not initialize rateset tables; that's not expected by rate control modules and will result in array access at index -1 - where ni_essid[] array is located (zeroed at allocation, so there are no user-visible consequences). Just delay rate control initialization to the moment, when rateset tables are initiaziled; nothing will use rates here anyway. MFC after:4 days Modified: head/sys/net80211/ieee80211_node.c Modified: head/sys/net80211/ieee80211_node.c == --- head/sys/net80211/ieee80211_node.c Wed Dec 19 02:34:31 2018 (r342210) +++ head/sys/net80211/ieee80211_node.c Wed Dec 19 03:08:10 2018 (r342211) @@ -1417,8 +1417,6 @@ ieee80211_alloc_node(struct ieee80211_node_table *nt, IEEE80211_NOTE(vap, IEEE80211_MSG_INACT, ni, "%s: inact_reload %u", __func__, ni->ni_inact_reload); - ieee80211_ratectl_node_init(ni); - return ni; } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r342273 - in stable/12/sys/dev: rtwn/usb usb usb/wlan
Author: avos
Date: Thu Dec 20 02:50:24 2018
New Revision: 342273
URL: https://svnweb.freebsd.org/changeset/base/342273
Log:
MFC r341786, r342156
rtwn, rsu: add more USB ids.
PR: 233638
Submitted by: cezary.sl...@gmail.com
Modified:
stable/12/sys/dev/rtwn/usb/rtwn_usb_attach.h
stable/12/sys/dev/usb/usbdevs
stable/12/sys/dev/usb/wlan/if_rsu.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/dev/rtwn/usb/rtwn_usb_attach.h
==
--- stable/12/sys/dev/rtwn/usb/rtwn_usb_attach.hThu Dec 20 01:35:45
2018(r342272)
+++ stable/12/sys/dev/rtwn/usb/rtwn_usb_attach.hThu Dec 20 02:50:24
2018(r342273)
@@ -118,6 +118,7 @@ static const STRUCT_USB_HOST_ID rtwn_devs[] = {
RTWN_RTL8188EU_DEV(DLINK, DWA123D1),
RTWN_RTL8188EU_DEV(DLINK, DWA125D1),
RTWN_RTL8188EU_DEV(ELECOM, WDC150SU2M),
+ RTWN_RTL8188EU_DEV(TPLINK, WN722NV2),
RTWN_RTL8188EU_DEV(REALTEK, RTL8188ETV),
RTWN_RTL8188EU_DEV(REALTEK, RTL8188EU),
#undef RTWN_RTL8188EU_DEV
Modified: stable/12/sys/dev/usb/usbdevs
==
--- stable/12/sys/dev/usb/usbdevs Thu Dec 20 01:35:45 2018
(r342272)
+++ stable/12/sys/dev/usb/usbdevs Thu Dec 20 02:50:24 2018
(r342273)
@@ -4344,6 +4344,7 @@ product SITECOMEU RT3072_40x0048 RT3072
product SITECOMEU RT3072_5 0x004a RT3072
product SITECOMEU WL349V1 0x004b WL-349 v1
product SITECOMEU RT3072_6 0x004d RT3072
+product SITECOMEU WLA1000 0x005b WLA-1000
product SITECOMEU RTL8188CU_1 0x0052 RTL8188CU
product SITECOMEU RTL8188CU_2 0x005c RTL8188CU
product SITECOMEU RTL8192CU0x0061 RTL8192CU
@@ -4609,6 +4610,7 @@ product TOSHIBA TRANSMEMORY 0x6545 USB ThumbDrive
product TPLINK T4U 0x0101 Archer T4U
product TPLINK WN822NV40x0108 TL-WN822N v4
product TPLINK WN823NV20x0109 TL-WN823N v2
+product TPLINK WN722NV20x010c TL-WN722N v2
product TPLINK T4UV2 0x010d Archer T4U ver 2
product TPLINK T4UHV1 0x0103 Archer T4UH ver 1
product TPLINK T4UHV2 0x010e Archer T4UH ver 2
Modified: stable/12/sys/dev/usb/wlan/if_rsu.c
==
--- stable/12/sys/dev/usb/wlan/if_rsu.c Thu Dec 20 01:35:45 2018
(r342272)
+++ stable/12/sys/dev/usb/wlan/if_rsu.c Thu Dec 20 02:50:24 2018
(r342273)
@@ -114,6 +114,7 @@ static const STRUCT_USB_HOST_ID rsu_devs[] = {
RSU_HT_NOT_SUPPORTED) }
RSU_DEV(ASUS, RTL8192SU),
RSU_DEV(AZUREWAVE, RTL8192SU_4),
+ RSU_DEV(SITECOMEU, WLA1000),
RSU_DEV_HT(ACCTON, RTL8192SU),
RSU_DEV_HT(ASUS,USBN10),
RSU_DEV_HT(AZUREWAVE, RTL8192SU_1),
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r342274 - in stable/11/sys/dev: urtwn usb usb/wlan
Author: avos
Date: Thu Dec 20 03:10:23 2018
New Revision: 342274
URL: https://svnweb.freebsd.org/changeset/base/342274
Log:
MFC r306173:
Add TP-Link Archer T4U (and TPLINK vendor record in usbdevs).
MFC r341786,r342156
urtwn, rsu: add more USB ids (rtwn -> urtwn merge was done manually).
PR: 233638
Submitted by: cezary.sl...@gmail.com
Modified:
stable/11/sys/dev/urtwn/if_urtwn.c
stable/11/sys/dev/usb/usbdevs
stable/11/sys/dev/usb/wlan/if_rsu.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/dev/urtwn/if_urtwn.c
==
--- stable/11/sys/dev/urtwn/if_urtwn.c Thu Dec 20 02:50:24 2018
(r342273)
+++ stable/11/sys/dev/urtwn/if_urtwn.c Thu Dec 20 03:10:23 2018
(r342274)
@@ -186,6 +186,7 @@ static const STRUCT_USB_HOST_ID urtwn_devs[] = {
URTWN_RTL8188E_DEV(DLINK, DWA123D1),
URTWN_RTL8188E_DEV(DLINK, DWA125D1),
URTWN_RTL8188E_DEV(ELECOM, WDC150SU2M),
+ URTWN_RTL8188E_DEV(TPLINK, WN722NV2),
URTWN_RTL8188E_DEV(REALTEK, RTL8188ETV),
URTWN_RTL8188E_DEV(REALTEK, RTL8188EU),
#undef URTWN_RTL8188E_DEV
Modified: stable/11/sys/dev/usb/usbdevs
==
--- stable/11/sys/dev/usb/usbdevs Thu Dec 20 02:50:24 2018
(r342273)
+++ stable/11/sys/dev/usb/usbdevs Thu Dec 20 03:10:23 2018
(r342274)
@@ -742,6 +742,7 @@ vendor VIALABS 0x2109 VIA Labs
vendor ERICSSON0x2282 Ericsson
vendor MOTOROLA2 0x22b8 Motorola
vendor WETELECOM 0x22de WeTelecom
+vendor TPLINK 0x2357 TP-Link
vendor WESTMOUNTAIN0x2405 West Mountain Radio
vendor TRIPPLITE 0x2478 Tripp-Lite
vendor HIROSE 0x2631 Hirose Electric
@@ -4232,6 +4233,7 @@ product SITECOMEU RT3072_40x0048 RT3072
product SITECOMEU RT3072_5 0x004a RT3072
product SITECOMEU WL349V1 0x004b WL-349 v1
product SITECOMEU RT3072_6 0x004d RT3072
+product SITECOMEU WLA1000 0x005b WLA-1000
product SITECOMEU RTL8188CU_1 0x0052 RTL8188CU
product SITECOMEU RTL8188CU_2 0x005c RTL8188CU
product SITECOMEU RTL8192CU0x0061 RTL8192CU
@@ -4478,6 +4480,10 @@ product TOSHIBA RT3070 0x0a07 RT3070
product TOSHIBA G450 0x0d45 G450 modem
product TOSHIBA HSDPA 0x1302 G450 modem
product TOSHIBA TRANSMEMORY0x6545 USB ThumbDrive
+
+/* TP-Link products */
+product TPLINK T4U 0x0101 Archer T4U
+product TPLINK WN722NV20x010c TL-WN722N v2
/* Trek Technology products */
product TREK THUMBDRIVE0x ThumbDrive
Modified: stable/11/sys/dev/usb/wlan/if_rsu.c
==
--- stable/11/sys/dev/usb/wlan/if_rsu.c Thu Dec 20 02:50:24 2018
(r342273)
+++ stable/11/sys/dev/usb/wlan/if_rsu.c Thu Dec 20 03:10:23 2018
(r342274)
@@ -113,6 +113,7 @@ static const STRUCT_USB_HOST_ID rsu_devs[] = {
RSU_HT_NOT_SUPPORTED) }
RSU_DEV(ASUS, RTL8192SU),
RSU_DEV(AZUREWAVE, RTL8192SU_4),
+ RSU_DEV(SITECOMEU, WLA1000),
RSU_DEV_HT(ACCTON, RTL8192SU),
RSU_DEV_HT(ASUS,USBN10),
RSU_DEV_HT(AZUREWAVE, RTL8192SU_1),
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r342461 - stable/12/sys/dev/iwi
Author: avos
Date: Tue Dec 25 13:37:43 2018
New Revision: 342461
URL: https://svnweb.freebsd.org/changeset/base/342461
Log:
MFC r342185:
iwi(4): do not leak node reference when IWI_FLAG_ASSOCIATED flag is set.
Modified:
stable/12/sys/dev/iwi/if_iwi.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/dev/iwi/if_iwi.c
==
--- stable/12/sys/dev/iwi/if_iwi.c Tue Dec 25 12:45:49 2018
(r342460)
+++ stable/12/sys/dev/iwi/if_iwi.c Tue Dec 25 13:37:43 2018
(r342461)
@@ -2833,12 +2833,12 @@ iwi_auth_and_assoc(struct iwi_softc *sc, struct ieee80
IWI_LOCK_ASSERT(sc);
- ni = ieee80211_ref_node(vap->iv_bss);
-
if (sc->flags & IWI_FLAG_ASSOCIATED) {
DPRINTF(("Already associated\n"));
return (-1);
}
+
+ ni = ieee80211_ref_node(vap->iv_bss);
IWI_STATE_BEGIN(sc, IWI_FW_ASSOCIATING);
error = 0;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r342462 - stable/11/sys/dev/iwi
Author: avos
Date: Tue Dec 25 13:39:11 2018
New Revision: 342462
URL: https://svnweb.freebsd.org/changeset/base/342462
Log:
MFC r342185:
iwi(4): do not leak node reference when IWI_FLAG_ASSOCIATED flag is set.
Modified:
stable/11/sys/dev/iwi/if_iwi.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/dev/iwi/if_iwi.c
==
--- stable/11/sys/dev/iwi/if_iwi.c Tue Dec 25 13:37:43 2018
(r342461)
+++ stable/11/sys/dev/iwi/if_iwi.c Tue Dec 25 13:39:11 2018
(r342462)
@@ -2820,12 +2820,12 @@ iwi_auth_and_assoc(struct iwi_softc *sc, struct ieee80
IWI_LOCK_ASSERT(sc);
- ni = ieee80211_ref_node(vap->iv_bss);
-
if (sc->flags & IWI_FLAG_ASSOCIATED) {
DPRINTF(("Already associated\n"));
return (-1);
}
+
+ ni = ieee80211_ref_node(vap->iv_bss);
IWI_STATE_BEGIN(sc, IWI_FW_ASSOCIATING);
error = 0;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r342463 - stable/12/sys/net80211
Author: avos Date: Tue Dec 25 13:51:21 2018 New Revision: 342463 URL: https://svnweb.freebsd.org/changeset/base/342463 Log: MFC r342211: net80211: fix out-of-bounds read in ieee80211_amrr(9) Modified: stable/12/sys/net80211/ieee80211_node.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/net80211/ieee80211_node.c == --- stable/12/sys/net80211/ieee80211_node.c Tue Dec 25 13:39:11 2018 (r342462) +++ stable/12/sys/net80211/ieee80211_node.c Tue Dec 25 13:51:21 2018 (r342463) @@ -1417,8 +1417,6 @@ ieee80211_alloc_node(struct ieee80211_node_table *nt, IEEE80211_NOTE(vap, IEEE80211_MSG_INACT, ni, "%s: inact_reload %u", __func__, ni->ni_inact_reload); - ieee80211_ratectl_node_init(ni); - return ni; } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r342464 - stable/11/sys/net80211
Author: avos Date: Tue Dec 25 13:54:10 2018 New Revision: 342464 URL: https://svnweb.freebsd.org/changeset/base/342464 Log: MFC r342211: net80211: fix out-of-bounds read in ieee80211_amrr(9) Modified: stable/11/sys/net80211/ieee80211_node.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/net80211/ieee80211_node.c == --- stable/11/sys/net80211/ieee80211_node.c Tue Dec 25 13:51:21 2018 (r342463) +++ stable/11/sys/net80211/ieee80211_node.c Tue Dec 25 13:54:10 2018 (r342464) @@ -1261,8 +1261,6 @@ ieee80211_alloc_node(struct ieee80211_node_table *nt, IEEE80211_NOTE(vap, IEEE80211_MSG_INACT, ni, "%s: inact_reload %u", __func__, ni->ni_inact_reload); - ieee80211_ratectl_node_init(ni); - return ni; } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r342465 - stable/10/sys/net80211
Author: avos Date: Tue Dec 25 14:06:52 2018 New Revision: 342465 URL: https://svnweb.freebsd.org/changeset/base/342465 Log: MFC r342211: net80211: fix out-of-bounds read in ieee80211_amrr(9) Modified: stable/10/sys/net80211/ieee80211_node.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/net80211/ieee80211_node.c == --- stable/10/sys/net80211/ieee80211_node.c Tue Dec 25 13:54:10 2018 (r342464) +++ stable/10/sys/net80211/ieee80211_node.c Tue Dec 25 14:06:52 2018 (r342465) @@ -1186,8 +1186,6 @@ ieee80211_alloc_node(struct ieee80211_node_table *nt, IEEE80211_NOTE(vap, IEEE80211_MSG_INACT, ni, "%s: inact_reload %u", __func__, ni->ni_inact_reload); - ieee80211_ratectl_node_init(ni); - return ni; } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r342604 - head/sys/net80211
Author: avos Date: Sun Dec 30 03:03:53 2018 New Revision: 342604 URL: https://svnweb.freebsd.org/changeset/base/342604 Log: net80211: fix duplicate sequence number bump for non-AMPDU QoS frames. This should be a part of r312972. MFC after:4 days Modified: head/sys/net80211/ieee80211_output.c Modified: head/sys/net80211/ieee80211_output.c == --- head/sys/net80211/ieee80211_output.cSun Dec 30 01:57:11 2018 (r342603) +++ head/sys/net80211/ieee80211_output.cSun Dec 30 03:03:53 2018 (r342604) @@ -1698,7 +1698,6 @@ ieee80211_encap(struct ieee80211vap *vap, struct ieee8 * capability; this may also change when we pull * aggregation up into net80211 */ - seqno = ni->ni_txseqs[tid]++; *(uint16_t *)wh->i_seq = htole16(seqno << IEEE80211_SEQ_SEQ_SHIFT); M_SEQNO_SET(m, seqno); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r306851 - stable/11/sys/dev/ral
Author: avos
Date: Sat Oct 8 16:39:21 2016
New Revision: 306851
URL: https://svnweb.freebsd.org/changeset/base/306851
Log:
MFC r306498:
ral (rt2860): eliminate duplicate ieee80211_process_callback() call
(left after r287197)
While here, add missing mergeinfo for r306320 (committed in r306549)
Modified:
stable/11/sys/dev/ral/rt2860.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/dev/ral/rt2860.c
==
--- stable/11/sys/dev/ral/rt2860.c Sat Oct 8 14:58:26 2016
(r306850)
+++ stable/11/sys/dev/ral/rt2860.c Sat Oct 8 16:39:21 2016
(r306851)
@@ -1140,10 +1140,6 @@ rt2860_tx_intr(struct rt2860_softc *sc,
bus_dmamap_sync(sc->txwi_dmat, data->map,
BUS_DMASYNC_POSTWRITE);
bus_dmamap_unload(sc->txwi_dmat, data->map);
- if (data->m->m_flags & M_TXCB) {
- ieee80211_process_callback(data->ni, data->m,
- 0);
- }
ieee80211_tx_complete(data->ni, data->m, 0);
data->ni = NULL;
data->m = NULL;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r306878 - head/sys/dev/wpi
Author: avos
Date: Sat Oct 8 20:41:08 2016
New Revision: 306878
URL: https://svnweb.freebsd.org/changeset/base/306878
Log:
wpi: restore frame header before submitting an mbuf to
ieee80211_tx_complete()
This change allows to pass packet length to rate control modules and
fixes IFCOUNTER_OBYTES calculation.
Tested with Intel 3945BG, STA mode.
Modified:
head/sys/dev/wpi/if_wpi.c
head/sys/dev/wpi/if_wpivar.h
Modified: head/sys/dev/wpi/if_wpi.c
==
--- head/sys/dev/wpi/if_wpi.c Sat Oct 8 19:54:01 2016(r306877)
+++ head/sys/dev/wpi/if_wpi.c Sat Oct 8 20:41:08 2016(r306878)
@@ -527,7 +527,8 @@ wpi_attach(device_t dev)
wpi_radiotap_attach(sc);
/* Setup Tx status flags (constant). */
- sc->sc_txs.flags = IEEE80211_RATECTL_STATUS_SHORT_RETRY |
+ sc->sc_txs.flags = IEEE80211_RATECTL_STATUS_PKTLEN |
+ IEEE80211_RATECTL_STATUS_SHORT_RETRY |
IEEE80211_RATECTL_STATUS_LONG_RETRY;
callout_init_mtx(&sc->calib_to, &sc->rxon_mtx, 0);
@@ -2079,9 +2080,15 @@ wpi_tx_done(struct wpi_softc *sc, struct
m = data->m, data->m = NULL;
ni = data->ni, data->ni = NULL;
+ /* Restore frame header. */
+ KASSERT(M_LEADINGSPACE(m) >= data->hdrlen, ("no frame header!"));
+ M_PREPEND(m, data->hdrlen, M_NOWAIT);
+ KASSERT(m != NULL, ("%s: m is NULL\n", __func__));
+
/*
* Update rate control statistics for the node.
*/
+ txs->pktlen = m->m_pkthdr.len;
txs->short_retries = stat->rtsfailcnt;
txs->long_retries = stat->ackfailcnt / WPI_NTRIES_DEFAULT;
if (!(status & WPI_TX_STATUS_FAIL))
@@ -2721,6 +2728,7 @@ wpi_cmd2(struct wpi_softc *sc, struct wp
data->m = buf->m;
data->ni = buf->ni;
+ data->hdrlen = hdrlen;
DPRINTF(sc, WPI_DEBUG_XMIT, "%s: qid %d idx %d len %d nsegs %d\n",
__func__, ring->qid, cur, totlen, nsegs);
Modified: head/sys/dev/wpi/if_wpivar.h
==
--- head/sys/dev/wpi/if_wpivar.hSat Oct 8 19:54:01 2016
(r306877)
+++ head/sys/dev/wpi/if_wpivar.hSat Oct 8 20:41:08 2016
(r306878)
@@ -63,6 +63,7 @@ struct wpi_tx_data {
bus_addr_t cmd_paddr;
struct mbuf *m;
struct ieee80211_node *ni;
+ int hdrlen;
};
struct wpi_tx_ring {
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r306900 - head/sys/dev/iwm
Author: avos
Date: Sun Oct 9 10:21:28 2016
New Revision: 306900
URL: https://svnweb.freebsd.org/changeset/base/306900
Log:
iwm: add missing 'Rx errors' counter incrementation.
Modified:
head/sys/dev/iwm/if_iwm.c
Modified: head/sys/dev/iwm/if_iwm.c
==
--- head/sys/dev/iwm/if_iwm.c Sun Oct 9 04:37:21 2016(r306899)
+++ head/sys/dev/iwm/if_iwm.c Sun Oct 9 10:21:28 2016(r306900)
@@ -2918,14 +2918,14 @@ iwm_mvm_rx_rx_mpdu(struct iwm_softc *sc,
device_printf(sc->sc_dev,
"dsp size out of range [0,20]: %d\n",
phy_info->cfg_phy_cnt);
- return;
+ goto fail;
}
if (!(rx_pkt_status & IWM_RX_MPDU_RES_STATUS_CRC_OK) ||
!(rx_pkt_status & IWM_RX_MPDU_RES_STATUS_OVERRUN_OK)) {
IWM_DPRINTF(sc, IWM_DEBUG_RECV,
"Bad CRC or FIFO: 0x%08X.\n", rx_pkt_status);
- return; /* drop */
+ goto fail;
}
if (sc->sc_capaflags & IWM_UCODE_TLV_FLAGS_RX_ENERGY_API) {
@@ -2947,7 +2947,7 @@ iwm_mvm_rx_rx_mpdu(struct iwm_softc *sc,
if (iwm_rx_addbuf(sc, IWM_RBUF_SIZE, sc->rxq.cur) != 0) {
device_printf(sc->sc_dev, "%s: unable to add more buffers\n",
__func__);
- return;
+ goto fail;
}
IWM_DPRINTF(sc, IWM_DEBUG_RECV,
@@ -3020,6 +3020,10 @@ iwm_mvm_rx_rx_mpdu(struct iwm_softc *sc,
ieee80211_input_mimo_all(ic, m, &rxs);
}
IWM_LOCK(sc);
+
+ return;
+
+fail: counter_u64_add(ic->ic_ierrors, 1);
}
static int
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307000 - in head: . share/man/man9
Author: avos Date: Mon Oct 10 17:16:02 2016 New Revision: 307000 URL: https://svnweb.freebsd.org/changeset/base/307000 Log: mbuf(9), mbuf_tags(9): fix function prototypes. - Add m_getclr(9) symlink to ObsoleteFiles.inc (removed in r295481). - Add const qualifiers in m_dup(), m_dup_pkthdr() and m_tag_copy_chain() (r286450). - Fix m_dup_pkthdr() definition (it's not the same as m_move_pkthdr()). MFC after:5 days Modified: head/ObsoleteFiles.inc head/share/man/man9/Makefile head/share/man/man9/mbuf.9 head/share/man/man9/mbuf_tags.9 Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Mon Oct 10 17:00:12 2016(r306999) +++ head/ObsoleteFiles.inc Mon Oct 10 17:16:02 2016(r307000) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20161010: remove link to removed m_getclr(9) macro +OLD_FILES+=usr/share/man/man9/m_getclr.9 # 20161003: MK_ELFCOPY_AS_OBJCOPY option retired OLD_FILES+=usr/bin/elfcopy OLD_FILES+=usr/share/man/man1/elfcopy.1.gz Modified: head/share/man/man9/Makefile == --- head/share/man/man9/MakefileMon Oct 10 17:00:12 2016 (r306999) +++ head/share/man/man9/MakefileMon Oct 10 17:16:02 2016 (r307000) @@ -1138,7 +1138,6 @@ MLINKS+=\ mbuf.9 m_get2.9 \ mbuf.9 m_getjcl.9 \ mbuf.9 m_getcl.9 \ - mbuf.9 m_getclr.9 \ mbuf.9 MGETHDR.9 \ mbuf.9 m_gethdr.9 \ mbuf.9 m_getm.9 \ Modified: head/share/man/man9/mbuf.9 == --- head/share/man/man9/mbuf.9 Mon Oct 10 17:00:12 2016(r306999) +++ head/share/man/man9/mbuf.9 Mon Oct 10 17:16:02 2016(r307000) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 30, 2016 +.Dd October 10, 2016 .Dt MBUF 9 .Os .\" @@ -79,8 +79,6 @@ .Ft struct mbuf * .Fn m_getcl "int how" "short type" "int flags" .Ft struct mbuf * -.Fn m_getclr "int how" "short type" -.Ft struct mbuf * .Fn m_gethdr "int how" "short type" .Ft struct mbuf * .Fn m_free "struct mbuf *mbuf" @@ -107,7 +105,7 @@ .Ft struct mbuf * .Fn m_copypacket "struct mbuf *mbuf" "int how" .Ft struct mbuf * -.Fn m_dup "struct mbuf *mbuf" "int how" +.Fn m_dup "const struct mbuf *mbuf" "int how" .Ft void .Fn m_copydata "const struct mbuf *mbuf" "int offset" "int len" "caddr_t buf" .Ft void @@ -126,8 +124,8 @@ .Fn m_catpkt "struct mbuf *m" "struct mbuf *n" .Ft u_int .Fn m_fixhdr "struct mbuf *mbuf" -.Ft void -.Fn m_dup_pkthdr "struct mbuf *to" "struct mbuf *from" +.Ft int +.Fn m_dup_pkthdr "struct mbuf *to" "const struct mbuf *from" "int how" .Ft void .Fn m_move_pkthdr "struct mbuf *to" "struct mbuf *from" .Ft u_int @@ -602,10 +600,6 @@ This is like but it the size of the cluster allocated will be large enough for .Fa size bytes. -.It Fn m_getclr how type -Allocate an -.Vt mbuf -and zero out the data region. .It Fn m_free mbuf Frees .Vt mbuf . Modified: head/share/man/man9/mbuf_tags.9 == --- head/share/man/man9/mbuf_tags.9 Mon Oct 10 17:00:12 2016 (r306999) +++ head/share/man/man9/mbuf_tags.9 Mon Oct 10 17:16:02 2016 (r307000) @@ -33,7 +33,7 @@ .Ft "struct m_tag *" .Fn m_tag_copy "struct m_tag *t" "int how" .Ft int -.Fn m_tag_copy_chain "struct mbuf *to" "struct mbuf *from" "int how" +.Fn m_tag_copy_chain "struct mbuf *to" "const struct mbuf *from" "int how" .Ft void .Fn m_tag_delete "struct mbuf *m" "struct m_tag *t" .Ft void ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307001 - head
Author: avos Date: Mon Oct 10 17:18:23 2016 New Revision: 307001 URL: https://svnweb.freebsd.org/changeset/base/307001 Log: Add missing *.gz extension. Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Mon Oct 10 17:16:02 2016(r307000) +++ head/ObsoleteFiles.inc Mon Oct 10 17:18:23 2016(r307001) @@ -39,7 +39,7 @@ # done # 20161010: remove link to removed m_getclr(9) macro -OLD_FILES+=usr/share/man/man9/m_getclr.9 +OLD_FILES+=usr/share/man/man9/m_getclr.9.gz # 20161003: MK_ELFCOPY_AS_OBJCOPY option retired OLD_FILES+=usr/bin/elfcopy OLD_FILES+=usr/share/man/man1/elfcopy.1.gz ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307158 - in head/sys: dev/iwm dev/otus dev/usb/wlan net80211
Author: avos
Date: Wed Oct 12 20:50:13 2016
New Revision: 307158
URL: https://svnweb.freebsd.org/changeset/base/307158
Log:
net80211: convert all ieee80211_input_mimo*() consumers
to ieee80211_add_rx_params() + drop last (ieee80211_rx_stats) parameter
Note: there is an additional check for ieee80211_get_rx_params()
return value (which does not exist in the original diff).
Reviewed by: adrian
Differential Revision:https://reviews.freebsd.org/D8207
Modified:
head/sys/dev/iwm/if_iwm.c
head/sys/dev/otus/if_otus.c
head/sys/dev/usb/wlan/if_rsu.c
head/sys/net80211/ieee80211_input.c
head/sys/net80211/ieee80211_proto.h
Modified: head/sys/dev/iwm/if_iwm.c
==
--- head/sys/dev/iwm/if_iwm.c Wed Oct 12 20:25:03 2016(r307157)
+++ head/sys/dev/iwm/if_iwm.c Wed Oct 12 20:50:13 2016(r307158)
@@ -2977,6 +2977,8 @@ iwm_mvm_rx_rx_mpdu(struct iwm_softc *sc,
/* rssi is in 1/2db units */
rxs.c_rssi = rssi * 2;
rxs.c_nf = sc->sc_noise;
+ if (ieee80211_add_rx_params(m, &rxs) == 0)
+ goto fail;
if (ieee80211_radiotap_active_vap(vap)) {
struct iwm_rx_radiotap_header *tap = &sc->sc_rxtap;
@@ -3013,11 +3015,11 @@ iwm_mvm_rx_rx_mpdu(struct iwm_softc *sc,
IWM_UNLOCK(sc);
if (ni != NULL) {
IWM_DPRINTF(sc, IWM_DEBUG_RECV, "input m %p\n", m);
- ieee80211_input_mimo(ni, m, &rxs);
+ ieee80211_input_mimo(ni, m);
ieee80211_free_node(ni);
} else {
IWM_DPRINTF(sc, IWM_DEBUG_RECV, "inputall m %p\n", m);
- ieee80211_input_mimo_all(ic, m, &rxs);
+ ieee80211_input_mimo_all(ic, m);
}
IWM_LOCK(sc);
Modified: head/sys/dev/otus/if_otus.c
==
--- head/sys/dev/otus/if_otus.c Wed Oct 12 20:25:03 2016(r307157)
+++ head/sys/dev/otus/if_otus.c Wed Oct 12 20:50:13 2016(r307158)
@@ -1713,7 +1713,10 @@ otus_sub_rxeof(struct otus_softc *sc, ui
rxs.c_nf = sc->sc_nf[0];/* XXX chain 0 != combined rssi/nf */
rxs.c_rssi = tail->rssi;
/* XXX TODO: add MIMO RSSI/NF as well */
- ieee80211_add_rx_params(m, &rxs);
+ if (ieee80211_add_rx_params(m, &rxs) == 0) {
+ counter_u64_add(ic->ic_ierrors, 1);
+ return;
+ }
/* XXX make a method */
STAILQ_INSERT_TAIL(&rxq->mq_head, m, m_stailqpkt);
@@ -1826,10 +1829,10 @@ tr_setup:
if (ni != NULL) {
if (ni->ni_flags & IEEE80211_NODE_HT)
m->m_flags |= M_AMPDU;
- (void)ieee80211_input_mimo(ni, m, NULL);
+ (void)ieee80211_input_mimo(ni, m);
ieee80211_free_node(ni);
} else
- (void)ieee80211_input_mimo_all(ic, m, NULL);
+ (void)ieee80211_input_mimo_all(ic, m);
}
#ifdef IEEE80211_SUPPORT_SUPERG
ieee80211_ff_age_all(ic, 100);
Modified: head/sys/dev/usb/wlan/if_rsu.c
==
--- head/sys/dev/usb/wlan/if_rsu.c Wed Oct 12 20:25:03 2016
(r307157)
+++ head/sys/dev/usb/wlan/if_rsu.c Wed Oct 12 20:50:13 2016
(r307158)
@@ -1536,10 +1536,12 @@ rsu_event_survey(struct rsu_softc *sc, u
/* This is a number from 0..100; so let's just divide it down a bit */
rxs.c_rssi = le32toh(bss->rssi) / 2;
rxs.c_nf = -96;
+ if (ieee80211_add_rx_params(m, &rxs) == 0)
+ return;
/* XXX avoid a LOR */
RSU_UNLOCK(sc);
- ieee80211_input_mimo_all(ic, m, &rxs);
+ ieee80211_input_mimo_all(ic, m);
RSU_LOCK(sc);
}
Modified: head/sys/net80211/ieee80211_input.c
==
--- head/sys/net80211/ieee80211_input.c Wed Oct 12 20:25:03 2016
(r307157)
+++ head/sys/net80211/ieee80211_input.c Wed Oct 12 20:50:13 2016
(r307158)
@@ -83,18 +83,14 @@ ieee80211_process_mimo(struct ieee80211_
}
int
-ieee80211_input_mimo(struct ieee80211_node *ni, struct mbuf *m,
-struct ieee80211_rx_stats *rx)
+ieee80211_input_mimo(struct ieee80211_node *ni, struct mbuf *m)
{
struct ieee80211_rx_stats rxs;
- if (rx) {
- memcpy(&rxs, rx, sizeof(*rx));
- } else {
- /* try to read from mbuf */
- bzero(&rxs, sizeof(rxs));
- ieee80211_get_rx_params(m, &rxs);
- }
+ /* try to read stats from mbuf */
+ bzero(&rxs, sizeof(rxs));
+ if (ieee80211_get_rx_params(m, &rxs) != 0)
+ return (-1);
/* XXX sho
svn commit: r307340 - in stable/11: . share/man/man9
Author: avos Date: Sat Oct 15 07:28:46 2016 New Revision: 307340 URL: https://svnweb.freebsd.org/changeset/base/307340 Log: MFC r307000, r307001: mbuf(9), mbuf_tags(9): fix function prototypes. - Add m_getclr(9) symlink to ObsoleteFiles.inc (removed in r295481). - Add const qualifiers in m_dup(), m_dup_pkthdr() and m_tag_copy_chain() (r286450). - Fix m_dup_pkthdr() definition (it's not the same as m_move_pkthdr()). Modified: stable/11/ObsoleteFiles.inc stable/11/share/man/man9/Makefile stable/11/share/man/man9/mbuf.9 stable/11/share/man/man9/mbuf_tags.9 Directory Properties: stable/11/ (props changed) Modified: stable/11/ObsoleteFiles.inc == --- stable/11/ObsoleteFiles.inc Sat Oct 15 06:16:35 2016(r307339) +++ stable/11/ObsoleteFiles.inc Sat Oct 15 07:28:46 2016(r307340) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20161015: remove link to removed m_getclr(9) macro +OLD_FILES+=usr/share/man/man9/m_getclr.9.gz # 20160703: POSIXify locales with variants OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_COLLATE OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_CTYPE Modified: stable/11/share/man/man9/Makefile == --- stable/11/share/man/man9/Makefile Sat Oct 15 06:16:35 2016 (r307339) +++ stable/11/share/man/man9/Makefile Sat Oct 15 07:28:46 2016 (r307340) @@ -1089,7 +1089,6 @@ MLINKS+=\ mbuf.9 m_get2.9 \ mbuf.9 m_getjcl.9 \ mbuf.9 m_getcl.9 \ - mbuf.9 m_getclr.9 \ mbuf.9 MGETHDR.9 \ mbuf.9 m_gethdr.9 \ mbuf.9 m_getm.9 \ Modified: stable/11/share/man/man9/mbuf.9 == --- stable/11/share/man/man9/mbuf.9 Sat Oct 15 06:16:35 2016 (r307339) +++ stable/11/share/man/man9/mbuf.9 Sat Oct 15 07:28:46 2016 (r307340) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 29, 2016 +.Dd October 10, 2016 .Dt MBUF 9 .Os .\" @@ -79,8 +79,6 @@ .Ft struct mbuf * .Fn m_getcl "int how" "short type" "int flags" .Ft struct mbuf * -.Fn m_getclr "int how" "short type" -.Ft struct mbuf * .Fn m_gethdr "int how" "short type" .Ft struct mbuf * .Fn m_free "struct mbuf *mbuf" @@ -107,7 +105,7 @@ .Ft struct mbuf * .Fn m_copypacket "struct mbuf *mbuf" "int how" .Ft struct mbuf * -.Fn m_dup "struct mbuf *mbuf" "int how" +.Fn m_dup "const struct mbuf *mbuf" "int how" .Ft void .Fn m_copydata "const struct mbuf *mbuf" "int offset" "int len" "caddr_t buf" .Ft void @@ -126,8 +124,8 @@ .Fn m_catpkt "struct mbuf *m" "struct mbuf *n" .Ft u_int .Fn m_fixhdr "struct mbuf *mbuf" -.Ft void -.Fn m_dup_pkthdr "struct mbuf *to" "struct mbuf *from" +.Ft int +.Fn m_dup_pkthdr "struct mbuf *to" "const struct mbuf *from" "int how" .Ft void .Fn m_move_pkthdr "struct mbuf *to" "struct mbuf *from" .Ft u_int @@ -602,10 +600,6 @@ This is like but it the size of the cluster allocated will be large enough for .Fa size bytes. -.It Fn m_getclr how type -Allocate an -.Vt mbuf -and zero out the data region. .It Fn m_free mbuf Frees .Vt mbuf . Modified: stable/11/share/man/man9/mbuf_tags.9 == --- stable/11/share/man/man9/mbuf_tags.9Sat Oct 15 06:16:35 2016 (r307339) +++ stable/11/share/man/man9/mbuf_tags.9Sat Oct 15 07:28:46 2016 (r307340) @@ -33,7 +33,7 @@ .Ft "struct m_tag *" .Fn m_tag_copy "struct m_tag *t" "int how" .Ft int -.Fn m_tag_copy_chain "struct mbuf *to" "struct mbuf *from" "int how" +.Fn m_tag_copy_chain "struct mbuf *to" "const struct mbuf *from" "int how" .Ft void .Fn m_tag_delete "struct mbuf *m" "struct m_tag *t" .Ft void ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307528 - svnadmin/conf
Author: avos Date: Mon Oct 17 19:51:00 2016 New Revision: 307528 URL: https://svnweb.freebsd.org/changeset/base/307528 Log: Increase size limit for rtwn(4) / urtwn(4) update. Modified: svnadmin/conf/sizelimit.conf Modified: svnadmin/conf/sizelimit.conf == --- svnadmin/conf/sizelimit.confMon Oct 17 18:52:25 2016 (r307527) +++ svnadmin/conf/sizelimit.confMon Oct 17 19:51:00 2016 (r307528) @@ -15,6 +15,7 @@ # First field is username, second field is the raised limit required. achim +avos bapt brooks davidcs ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307529 - in head: . etc etc/devd share/doc/legal/realtek share/man/man4 sys/conf sys/contrib/dev/rtwn sys/contrib/dev/urtwn sys/dev/rtwn sys/dev/rtwn/pci sys/dev/rtwn/rtl8188e sys/dev/...
ot;0x0074";
+ action "kldload -n if_rtwn_usb";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x0df6";
match "product" "0x061c";
action "kldload -n if_axe";
};
@@ -3257,8 +3305,8 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x0e66";
- match "product" "0x0019";
- action "kldload -n if_urtwn";
+ match "product" "(0x0019|0x0023)";
+ action "kldload -n if_rtwn_usb";
};
nomatch 32 {
@@ -3330,7 +3378,7 @@ nomatch 32 {
match "mode" "host";
match "vendor" "0x0eb0";
match "product" "0x9071";
- action "kldload -n if_urtwn";
+ action "kldload -n if_rtwn_usb";
};
nomatch 32 {
@@ -3490,7 +3538,7 @@ nomatch 32 {
match "mode" "host";
match "vendor" "0x103c";
match "product" "0x1629";
- action "kldload -n if_urtwn";
+ action "kldload -n if_rtwn_usb";
};
nomatch 32 {
@@ -3976,6 +4024,14 @@ nomatch 32 {
nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
+ match "vendor" "0x13b1";
+ match "product" "0x003f";
+ action "kldload -n if_rtwn_usb";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
match "vendor" "0x13d2";
match "product" "0x0400";
action "kldload -n if_kue";
@@ -4018,7 +4074,7 @@ nomatch 32 {
match "mode" "host";
match "vendor" "0x13d3";
match "product" "(0x3357|0x3358|0x3359)";
- action "kldload -n if_urtwn";
+ action "kldload -n if_rtwn_usb";
};
nomatch 32 {
@@ -4569,6 +4625,14 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x1740";
+ match "product" "0x0100";
+ action "kldload -n if_rtwn_usb";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x1740";
match "product" "(0x0605|0x0615)";
action "kldload -n if_run";
};
@@ -4961,8 +5025,8 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x2001";
- match "product" "(0x3307|0x3308|0x3309|0x330a|0x330d|0x330f|0x3310)";
- action "kldload -n if_urtwn";
+ match "product"
"(0x3307|0x3308|0x3309|0x330a|0x330d|0x330f|0x3310|0x3314|0x3315|0x3316|0x3318)";
+ action "kldload -n if_rtwn_usb";
};
nomatch 32 {
@@ -5042,7 +5106,7 @@ nomatch 32 {
match "mode" "host";
match "vendor" "0x2019";
match "product" "(0x1201|0x4902)";
- action "kldload -n if_urtwn";
+ action "kldload -n if_rtwn_usb";
};
nomatch 32 {
@@ -5089,8 +5153,8 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x2019";
- match "product" "(0xab2a|0xab2b|0xab2e)";
- action "kldload -n if_urtwn";
+ match "product" "(0xab2a|0xab2b|0xab2e|0xab30)";
+ action "kldload -n if_rtwn_usb";
};
nomatch 32 {
@@ -5130,7 +5194,7 @@ nomatch 32 {
match "mode" "host";
match "vendor" "0x2019";
match "product" "0xed17";
- action "kldload -n if_urtwn";
+ action "kldload -n if_rtwn_usb";
};
nomatch 32 {
@@ -5170,7 +5234,7 @@ nomatch 32 {
match "mode" "host";
match "vendor" "0x20f4";
match "product" "0x624d";
- action "kldload -n if_urtwn";
+ action "kldload -n if_rtwn_usb";
};
nomatch 32 {
@@ -5185,8 +5249,8 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" &
svn commit: r307530 - svnadmin/conf
Author: avos Date: Mon Oct 17 20:41:12 2016 New Revision: 307530 URL: https://svnweb.freebsd.org/changeset/base/307530 Log: Remove myself from sizelimit.conf Modified: svnadmin/conf/sizelimit.conf Modified: svnadmin/conf/sizelimit.conf == --- svnadmin/conf/sizelimit.confMon Oct 17 20:38:24 2016 (r307529) +++ svnadmin/conf/sizelimit.confMon Oct 17 20:41:12 2016 (r307530) @@ -15,7 +15,6 @@ # First field is username, second field is the raised limit required. achim -avos bapt brooks davidcs ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307532 - in head: . share/man/man4
Author: avos Date: Mon Oct 17 21:35:13 2016 New Revision: 307532 URL: https://svnweb.freebsd.org/changeset/base/307532 Log: Fix dates + add an UPDATING entry. Modified: head/ObsoleteFiles.inc head/UPDATING head/share/man/man4/rtwn.4 head/share/man/man4/rtwn_pci.4 head/share/man/man4/rtwn_usb.4 Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Mon Oct 17 20:57:54 2016(r307531) +++ head/ObsoleteFiles.inc Mon Oct 17 21:35:13 2016(r307532) @@ -38,7 +38,7 @@ # xargs -n1 | sort | uniq -d; # done -# 20161016: urtwn(4) was merged into rtwn(4) +# 20161017: urtwn(4) was merged into rtwn(4) OLD_FILES+=usr/share/man/man4/urtwn.4.gz OLD_FILES+=usr/share/man/man4/urtwnfw.4.gz # 20161015: Remove GNU rcs Modified: head/UPDATING == --- head/UPDATING Mon Oct 17 20:57:54 2016(r307531) +++ head/UPDATING Mon Oct 17 21:35:13 2016(r307532) @@ -31,6 +31,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20161017: + The urtwn(4) driver was merged into rtwn(4) and now consists of + rtwn(4) main module + rtwn_usb(4) and rtwn_pci(4) bus-specific + parts. + Also, firmware for RTL8188CE was renamed due to possible name + conflict (rtwnrtl8192cU(B) -> rtwnrtl8192cE(B)) + 20161015: GNU rcs has been removed from base. It is available as packages: - rcs: Latest GPLv3 GNU rcs version. Modified: head/share/man/man4/rtwn.4 == --- head/share/man/man4/rtwn.4 Mon Oct 17 20:57:54 2016(r307531) +++ head/share/man/man4/rtwn.4 Mon Oct 17 21:35:13 2016(r307532) @@ -18,7 +18,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 19, 2016 +.Dd October 17, 2016 .Dt RTWN 4 .Os .Sh NAME Modified: head/share/man/man4/rtwn_pci.4 == --- head/share/man/man4/rtwn_pci.4 Mon Oct 17 20:57:54 2016 (r307531) +++ head/share/man/man4/rtwn_pci.4 Mon Oct 17 21:35:13 2016 (r307532) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\"/ -.Dd September 19, 2016 +.Dd October 17, 2016 .Dt RTWN_PCI 4 .Os .Sh NAME Modified: head/share/man/man4/rtwn_usb.4 == --- head/share/man/man4/rtwn_usb.4 Mon Oct 17 20:57:54 2016 (r307531) +++ head/share/man/man4/rtwn_usb.4 Mon Oct 17 21:35:13 2016 (r307532) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\"/ -.Dd September 19, 2016 +.Dd October 17, 2016 .Dt RTWN_USB 4 .Os .Sh NAME ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307577 - head/sys/dev/rtwn/usb
Author: avos Date: Tue Oct 18 21:17:31 2016 New Revision: 307577 URL: https://svnweb.freebsd.org/changeset/base/307577 Log: rtwn(4): fix build with 'options IEEE80211_SUPPORT_SUPERG' Modified: head/sys/dev/rtwn/usb/rtwn_usb_rx.c head/sys/dev/rtwn/usb/rtwn_usb_tx.c Modified: head/sys/dev/rtwn/usb/rtwn_usb_rx.c == --- head/sys/dev/rtwn/usb/rtwn_usb_rx.c Tue Oct 18 20:17:57 2016 (r307576) +++ head/sys/dev/rtwn/usb/rtwn_usb_rx.c Tue Oct 18 21:17:31 2016 (r307577) @@ -216,7 +216,7 @@ rtwn_report_intr(struct rtwn_usb_softc * * NB: this will executed only when 'report' bit is set. */ if (sc->sc_tx_n_active > 0 && --sc->sc_tx_n_active <= 1) - rtwn_cmd_sleepable(uc, NULL, 0, rtwn_ff_flush_all); + rtwn_cmd_sleepable(sc, NULL, 0, rtwn_ff_flush_all); #endif break; case RTWN_RX_OTHER: @@ -327,7 +327,7 @@ finish: */ #ifdef IEEE80211_SUPPORT_SUPERG if (!(sc->sc_flags & RTWN_FW_LOADED)) - rtwn_cmd_sleepable(uc, NULL, 0, rtwn_ff_flush_all); + rtwn_cmd_sleepable(sc, NULL, 0, rtwn_ff_flush_all); #endif /* Kick-start more transmit in case we stalled */ Modified: head/sys/dev/rtwn/usb/rtwn_usb_tx.c == --- head/sys/dev/rtwn/usb/rtwn_usb_tx.c Tue Oct 18 20:17:57 2016 (r307576) +++ head/sys/dev/rtwn/usb/rtwn_usb_tx.c Tue Oct 18 21:17:31 2016 (r307577) @@ -207,7 +207,7 @@ finish: * XXX TODO: just make this a callout timer schedule so we can * flush the FF staging queue if we're approaching idle. */ - rtwn_cmd_sleepable(uc, NULL, 0, rtwn_ff_flush_all); + rtwn_cmd_sleepable(sc, NULL, 0, rtwn_ff_flush_all); } #endif /* Kick-start more transmit */ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r335351 - in head/sys/dev/rtwn: rtl8812a rtl8812a/usb rtl8821a/usb
Author: avos
Date: Tue Jun 19 00:38:28 2018
New Revision: 335351
URL: https://svnweb.freebsd.org/changeset/base/335351
Log:
rtwn(4): decode some bit fields + merge duplicate code.
Add macros for R12A_RXDMA_PRO register (descriptions were seen in the
RTL8822B vendor driver) and merge 2 r21au_init_burstlen() copies.
No functional change intended.
Modified:
head/sys/dev/rtwn/rtl8812a/r12a_reg.h
head/sys/dev/rtwn/rtl8812a/usb/r12au.h
head/sys/dev/rtwn/rtl8812a/usb/r12au_init.c
head/sys/dev/rtwn/rtl8821a/usb/r21au.h
head/sys/dev/rtwn/rtl8821a/usb/r21au_attach.c
head/sys/dev/rtwn/rtl8821a/usb/r21au_init.c
Modified: head/sys/dev/rtwn/rtl8812a/r12a_reg.h
==
--- head/sys/dev/rtwn/rtl8812a/r12a_reg.h Tue Jun 19 00:27:30 2018
(r335350)
+++ head/sys/dev/rtwn/rtl8812a/r12a_reg.h Tue Jun 19 00:38:28 2018
(r335351)
@@ -58,6 +58,16 @@
/* Bits for R92C_LEDCFG2. */
#define R12A_LEDCFG2_ENA 0x20
+/* Bits for R12A_RXDMA_PRO. */
+#define R12A_DMA_MODE 0x02
+#define R12A_BURST_CNT_M 0x0c
+#define R12A_BURST_CNT_S 2
+#define R12A_BURST_SZ_M0x30
+#define R12A_BURST_SZ_S4
+#define R12A_BURST_SZ_USB3 0
+#define R12A_BURST_SZ_USB2 1
+#define R12A_BURST_SZ_USB1 2
+
/* Bits for R12A_CCK_CHECK. */
#define R12A_CCK_CHECK_BCN10x20
#define R12A_CCK_CHECK_5GHZ0x80
Modified: head/sys/dev/rtwn/rtl8812a/usb/r12au.h
==
--- head/sys/dev/rtwn/rtl8812a/usb/r12au.h Tue Jun 19 00:27:30 2018
(r335350)
+++ head/sys/dev/rtwn/rtl8812a/usb/r12au.h Tue Jun 19 00:38:28 2018
(r335351)
@@ -37,6 +37,7 @@
*/
/* r12au_init.c */
void r12au_init_rx_agg(struct rtwn_softc *);
+void r12au_init_burstlen_usb2(struct rtwn_softc *);
void r12au_init_burstlen(struct rtwn_softc *);
void r12au_init_ampdu_fwhw(struct rtwn_softc *);
void r12au_init_ampdu(struct rtwn_softc *);
Modified: head/sys/dev/rtwn/rtl8812a/usb/r12au_init.c
==
--- head/sys/dev/rtwn/rtl8812a/usb/r12au_init.c Tue Jun 19 00:27:30 2018
(r335350)
+++ head/sys/dev/rtwn/rtl8812a/usb/r12au_init.c Tue Jun 19 00:38:28 2018
(r335351)
@@ -72,19 +72,32 @@ r12au_init_rx_agg(struct rtwn_softc *sc)
}
void
+r12au_init_burstlen_usb2(struct rtwn_softc *sc)
+{
+ const uint8_t dma_count = R12A_DMA_MODE | SM(R12A_BURST_CNT, 3);
+
+ if ((rtwn_read_1(sc, R92C_USB_INFO) & 0x30) == 0) {
+ /* Set burst packet length to 512 B. */
+ rtwn_setbits_1(sc, R12A_RXDMA_PRO, R12A_BURST_SZ_M,
+ dma_count | SM(R12A_BURST_SZ, R12A_BURST_SZ_USB2));
+ } else {
+ /* Set burst packet length to 64 B. */
+ rtwn_setbits_1(sc, R12A_RXDMA_PRO, R12A_BURST_SZ_M,
+ dma_count | SM(R12A_BURST_SZ, R12A_BURST_SZ_USB1));
+ }
+}
+
+void
r12au_init_burstlen(struct rtwn_softc *sc)
{
- if (rtwn_read_1(sc, R92C_TYPE_ID + 3) & 0x80) {
- if ((rtwn_read_1(sc, R92C_USB_INFO) & 0x30) == 0) {
- /* Set burst packet length to 512 B. */
- rtwn_setbits_1(sc, R12A_RXDMA_PRO, 0x20, 0x1e);
- } else {
- /* Set burst packet length to 64 B. */
- rtwn_setbits_1(sc, R12A_RXDMA_PRO, 0x10, 0x2e);
- }
- } else {/* USB 3.0 */
+ const uint8_t dma_count = R12A_DMA_MODE | SM(R12A_BURST_CNT, 3);
+
+ if (rtwn_read_1(sc, R92C_TYPE_ID + 3) & 0x80)
+ r12au_init_burstlen_usb2(sc);
+ else { /* USB 3.0 */
/* Set burst packet length to 1 KB. */
- rtwn_setbits_1(sc, R12A_RXDMA_PRO, 0x30, 0x0e);
+ rtwn_setbits_1(sc, R12A_RXDMA_PRO, R12A_BURST_SZ_M,
+ dma_count | SM(R12A_BURST_SZ, R12A_BURST_SZ_USB3));
rtwn_setbits_1(sc, 0xf008, 0x18, 0);
}
Modified: head/sys/dev/rtwn/rtl8821a/usb/r21au.h
==
--- head/sys/dev/rtwn/rtl8821a/usb/r21au.h Tue Jun 19 00:27:30 2018
(r335350)
+++ head/sys/dev/rtwn/rtl8821a/usb/r21au.h Tue Jun 19 00:38:28 2018
(r335351)
@@ -37,7 +37,6 @@
*/
/* r21au_init.c */
void r21au_init_tx_agg(struct rtwn_softc *);
-void r21au_init_burstlen(struct rtwn_softc *);
/* r21au_dfs.c */
void r21au_chan_check(void *, int);
Modified: head/sys/dev/rtwn/rtl8821a/usb/r21au_attach.c
==
--- head/sys/dev/rtwn/rtl8821a/usb/r21au_attach.c Tue Jun 19 00:27:30
2018(r335350)
+++ head/sys/dev/rtwn/
svn commit: r345634 - in stable/12: share/man/man9 sys/dev/ath sys/dev/bwi sys/dev/bwn sys/dev/ipw sys/dev/iwi sys/dev/iwm sys/dev/iwn sys/dev/malo sys/dev/mwl sys/dev/otus sys/dev/ral sys/dev/rtwn...
Author: avos
Date: Thu Mar 28 09:16:00 2019
New Revision: 345634
URL: https://svnweb.freebsd.org/changeset/base/345634
Log:
MFC r344990:
Fix ieee80211_radiotap(9) usage in wireless drivers:
- Alignment issues:
* Add missing __packed attributes + padding across all drivers; in
most places there was an assumption that padding will be always
minimally suitable; in few places - e.g., in urtw(4) / rtwn(4) -
padding was just missing.
* Add __aligned(8) attribute for all Rx radiotap headers since they can
contain 64-bit TSF timestamp; it cannot appear in Tx radiotap headers, so
just drop the attribute here. Refresh ieee80211_radiotap(9) man page
accordingly.
- Since net80211 automatically updates channel frequency / flags in
ieee80211_radiotap_chan_change() drop duplicate setup for these fields
in drivers.
Modified:
stable/12/share/man/man9/ieee80211_radiotap.9
stable/12/sys/dev/ath/if_athioctl.h
stable/12/sys/dev/bwi/if_bwi.c
stable/12/sys/dev/bwi/if_bwivar.h
stable/12/sys/dev/bwn/if_bwn.c
stable/12/sys/dev/bwn/if_bwnvar.h
stable/12/sys/dev/ipw/if_ipwvar.h
stable/12/sys/dev/iwi/if_iwivar.h
stable/12/sys/dev/iwm/if_iwmvar.h
stable/12/sys/dev/iwn/if_iwn.c
stable/12/sys/dev/iwn/if_iwnvar.h
stable/12/sys/dev/malo/if_maloioctl.h
stable/12/sys/dev/mwl/if_mwlioctl.h
stable/12/sys/dev/otus/if_otus.c
stable/12/sys/dev/otus/if_otusreg.h
stable/12/sys/dev/ral/rt2560var.h
stable/12/sys/dev/ral/rt2661var.h
stable/12/sys/dev/ral/rt2860var.h
stable/12/sys/dev/rtwn/if_rtwn.c
stable/12/sys/dev/rtwn/if_rtwnvar.h
stable/12/sys/dev/usb/wlan/if_rsu.c
stable/12/sys/dev/usb/wlan/if_rsureg.h
stable/12/sys/dev/usb/wlan/if_rumvar.h
stable/12/sys/dev/usb/wlan/if_run.c
stable/12/sys/dev/usb/wlan/if_runvar.h
stable/12/sys/dev/usb/wlan/if_uathvar.h
stable/12/sys/dev/usb/wlan/if_upgtvar.h
stable/12/sys/dev/usb/wlan/if_uralvar.h
stable/12/sys/dev/usb/wlan/if_urtw.c
stable/12/sys/dev/usb/wlan/if_urtwvar.h
stable/12/sys/dev/usb/wlan/if_zydreg.h
stable/12/sys/dev/wi/if_wireg.h
stable/12/sys/dev/wpi/if_wpivar.h
stable/12/sys/dev/wtap/if_wtapioctl.h
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/share/man/man9/ieee80211_radiotap.9
==
--- stable/12/share/man/man9/ieee80211_radiotap.9 Thu Mar 28 09:00:56
2019(r345633)
+++ stable/12/share/man/man9/ieee80211_radiotap.9 Thu Mar 28 09:16:00
2019(r345634)
@@ -27,7 +27,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd August 4, 2009
+.Dd March 11, 2019
.Dt IEEE80211_RADIOTAP 9
.Os
.Sh NAME
@@ -257,7 +257,7 @@ struct wi_rx_radiotap_header {
uint16_t wr_chan_flags;
uint8_twr_antsignal;
uint8_twr_antnoise;
-} __packed;
+} __packed __aligned(8);
.Ed
.Pp
and transmit definitions for the Atheros driver:
Modified: stable/12/sys/dev/ath/if_athioctl.h
==
--- stable/12/sys/dev/ath/if_athioctl.h Thu Mar 28 09:00:56 2019
(r345633)
+++ stable/12/sys/dev/ath/if_athioctl.h Thu Mar 28 09:16:00 2019
(r345634)
@@ -373,7 +373,7 @@ struct ath_rx_radiotap_header {
*/
struct ath_radiotap_vendor_hdr wr_v;
#endif /* ATH_ENABLE_RADIOTAP_VENDOR_EXT */
-} __packed;
+} __packed __aligned(8);
#define ATH_TX_RADIOTAP_PRESENT ( \
(1 << IEEE80211_RADIOTAP_FLAGS) | \
Modified: stable/12/sys/dev/bwi/if_bwi.c
==
--- stable/12/sys/dev/bwi/if_bwi.c Thu Mar 28 09:00:56 2019
(r345633)
+++ stable/12/sys/dev/bwi/if_bwi.c Thu Mar 28 09:16:00 2019
(r345634)
@@ -1729,15 +1729,6 @@ bwi_set_channel(struct ieee80211com *ic)
bwi_rf_set_chan(mac, ieee80211_chan2ieee(ic, c), 0);
sc->sc_rates = ieee80211_get_ratetable(c);
-
- /*
-* Setup radio tap channel freq and flags
-*/
- sc->sc_tx_th.wt_chan_freq = sc->sc_rx_th.wr_chan_freq =
- htole16(c->ic_freq);
- sc->sc_tx_th.wt_chan_flags = sc->sc_rx_th.wr_chan_flags =
- htole16(c->ic_flags & 0x);
-
BWI_UNLOCK(sc);
}
Modified: stable/12/sys/dev/bwi/if_bwivar.h
==
--- stable/12/sys/dev/bwi/if_bwivar.h Thu Mar 28 09:00:56 2019
(r345633)
+++ stable/12/sys/dev/bwi/if_bwivar.h Thu Mar 28 09:16:00 2019
(r345634)
@@ -513,7 +513,7 @@ struct bwi_tx_radiotap_hdr {
uint8_t wt_rate;
uint16_twt_chan_freq;
uint16_twt_chan_flags;
-};
+} __packed;
#define BWI_RX_RADIOTAP_PRESENT\
((1 << IEEE80211_RADIOTAP_TSFT) | \
@@ -533,7 +533,7 @@ struct bwi_rx_radiotap_hdr {
int8_t wr_antsignal;
int8_t
svn commit: r345635 - in stable/11: share/man/man9 sys/dev/ath sys/dev/usb/wlan
Author: avos
Date: Thu Mar 28 09:18:22 2019
New Revision: 345635
URL: https://svnweb.freebsd.org/changeset/base/345635
Log:
MFC r306049:
net80211: remove IEEE80211_RADIOTAP_TSFT field from transmit definitions.
This field may be used for received frames only.
Modified:
stable/11/share/man/man9/ieee80211_radiotap.9
stable/11/sys/dev/ath/if_ath_tx.c
stable/11/sys/dev/ath/if_athioctl.h
stable/11/sys/dev/usb/wlan/if_rum.c
stable/11/sys/dev/usb/wlan/if_rumvar.h
stable/11/sys/dev/usb/wlan/if_run.c
stable/11/sys/dev/usb/wlan/if_runvar.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/share/man/man9/ieee80211_radiotap.9
==
--- stable/11/share/man/man9/ieee80211_radiotap.9 Thu Mar 28 09:16:00
2019(r345634)
+++ stable/11/share/man/man9/ieee80211_radiotap.9 Thu Mar 28 09:18:22
2019(r345635)
@@ -263,7 +263,6 @@ struct wi_rx_radiotap_header {
and transmit definitions for the Atheros driver:
.Bd -literal -offset indent
#define ATH_TX_RADIOTAP_PRESENT ( \\
-(1 << IEEE80211_RADIOTAP_TSFT) | \\
(1 << IEEE80211_RADIOTAP_FLAGS) | \\
(1 << IEEE80211_RADIOTAP_RATE) | \\
(1 << IEEE80211_RADIOTAP_DBM_TX_POWER) | \\
@@ -273,7 +272,6 @@ and transmit definitions for the Atheros driver:
struct ath_tx_radiotap_header {
struct ieee80211_radiotap_header wt_ihdr;
-uint64_t wt_tsf;
uint8_twt_flags;
uint8_twt_rate;
uint8_twt_txpower;
Modified: stable/11/sys/dev/ath/if_ath_tx.c
==
--- stable/11/sys/dev/ath/if_ath_tx.c Thu Mar 28 09:16:00 2019
(r345634)
+++ stable/11/sys/dev/ath/if_ath_tx.c Thu Mar 28 09:18:22 2019
(r345635)
@@ -1527,7 +1527,6 @@ ath_tx_normal_setup(struct ath_softc *sc, struct ieee8
struct ath_buf *bf, struct mbuf *m0, struct ath_txq *txq)
{
struct ieee80211vap *vap = ni->ni_vap;
- struct ath_hal *ah = sc->sc_ah;
struct ieee80211com *ic = &sc->sc_ic;
const struct chanAccParams *cap = &ic->ic_wme.wme_chanParams;
int error, iswep, ismcast, isfrag, ismrr;
@@ -1783,9 +1782,6 @@ ath_tx_normal_setup(struct ath_softc *sc, struct ieee8
sc->sc_hwmap[rix].ieeerate, -1);
if (ieee80211_radiotap_active_vap(vap)) {
- u_int64_t tsf = ath_hal_gettsf64(ah);
-
- sc->sc_tx_th.wt_tsf = htole64(tsf);
sc->sc_tx_th.wt_flags = sc->sc_hwmap[rix].txflags;
if (iswep)
sc->sc_tx_th.wt_flags |= IEEE80211_RADIOTAP_F_WEP;
@@ -2066,7 +2062,6 @@ ath_tx_raw_start(struct ath_softc *sc, struct ieee8021
const struct ieee80211_bpf_params *params)
{
struct ieee80211com *ic = &sc->sc_ic;
- struct ath_hal *ah = sc->sc_ah;
struct ieee80211vap *vap = ni->ni_vap;
int error, ismcast, ismrr;
int keyix, hdrlen, pktlen, try0, txantenna;
@@ -2201,9 +2196,6 @@ ath_tx_raw_start(struct ath_softc *sc, struct ieee8021
sc->sc_hwmap[rix].ieeerate, -1);
if (ieee80211_radiotap_active_vap(vap)) {
- u_int64_t tsf = ath_hal_gettsf64(ah);
-
- sc->sc_tx_th.wt_tsf = htole64(tsf);
sc->sc_tx_th.wt_flags = sc->sc_hwmap[rix].txflags;
if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED)
sc->sc_tx_th.wt_flags |= IEEE80211_RADIOTAP_F_WEP;
Modified: stable/11/sys/dev/ath/if_athioctl.h
==
--- stable/11/sys/dev/ath/if_athioctl.h Thu Mar 28 09:16:00 2019
(r345634)
+++ stable/11/sys/dev/ath/if_athioctl.h Thu Mar 28 09:18:22 2019
(r345635)
@@ -374,7 +374,6 @@ struct ath_rx_radiotap_header {
} __packed;
#define ATH_TX_RADIOTAP_PRESENT ( \
- (1 << IEEE80211_RADIOTAP_TSFT) | \
(1 << IEEE80211_RADIOTAP_FLAGS) | \
(1 << IEEE80211_RADIOTAP_RATE) | \
(1 << IEEE80211_RADIOTAP_DBM_TX_POWER) | \
@@ -384,7 +383,6 @@ struct ath_rx_radiotap_header {
struct ath_tx_radiotap_header {
struct ieee80211_radiotap_header wt_ihdr;
- u_int64_t wt_tsf;
u_int8_twt_flags;
u_int8_twt_rate;
u_int8_twt_txpower;
Modified: stable/11/sys/dev/usb/wlan/if_rum.c
==
--- stable/11/sys/dev/usb/wlan/if_rum.c Thu Mar 28 09:16:00 2019
(r345634)
+++ stable/11/sys/dev/usb/wlan/if_rum.c Thu Mar 28 09:18:22 2019
(r345635)
@@ -1075,7 +1075,6 @@ tr_setup:
tap->wt_flags = 0;
tap->wt_rate = data->rate;
- rum_get_tsf(sc, &ta
svn commit: r345636 - in stable/11: share/man/man9 sys/dev/ath sys/dev/bwi sys/dev/bwn sys/dev/ipw sys/dev/iwi sys/dev/iwm sys/dev/iwn sys/dev/malo sys/dev/mwl sys/dev/otus sys/dev/ral sys/dev/rtwn...
Author: avos
Date: Thu Mar 28 09:50:25 2019
New Revision: 345636
URL: https://svnweb.freebsd.org/changeset/base/345636
Log:
MFC r344990:
Fix ieee80211_radiotap(9) usage in wireless drivers:
- Alignment issues:
* Add missing __packed attributes + padding across all drivers; in
most places there was an assumption that padding will be always
minimally suitable; in few places - e.g., in urtw(4) / rtwn(4) -
padding was just missing.
* Add __aligned(8) attribute for all Rx radiotap headers since they can
contain 64-bit TSF timestamp; it cannot appear in Tx radiotap headers, so
just drop the attribute here. Refresh ieee80211_radiotap(9) man page
accordingly.
- Since net80211 automatically updates channel frequency / flags in
ieee80211_radiotap_chan_change() drop duplicate setup for these fields
in drivers.
Modified:
stable/11/share/man/man9/ieee80211_radiotap.9
stable/11/sys/dev/ath/if_athioctl.h
stable/11/sys/dev/bwi/if_bwi.c
stable/11/sys/dev/bwi/if_bwivar.h
stable/11/sys/dev/bwn/if_bwn.c
stable/11/sys/dev/bwn/if_bwnvar.h
stable/11/sys/dev/ipw/if_ipwvar.h
stable/11/sys/dev/iwi/if_iwivar.h
stable/11/sys/dev/iwm/if_iwmvar.h
stable/11/sys/dev/iwn/if_iwn.c
stable/11/sys/dev/iwn/if_iwnvar.h
stable/11/sys/dev/malo/if_maloioctl.h
stable/11/sys/dev/mwl/if_mwlioctl.h
stable/11/sys/dev/otus/if_otus.c
stable/11/sys/dev/otus/if_otusreg.h
stable/11/sys/dev/ral/rt2560var.h
stable/11/sys/dev/ral/rt2661var.h
stable/11/sys/dev/ral/rt2860var.h
stable/11/sys/dev/rtwn/if_rtwn.c
stable/11/sys/dev/rtwn/if_rtwnreg.h
stable/11/sys/dev/urtwn/if_urtwn.c
stable/11/sys/dev/urtwn/if_urtwnvar.h
stable/11/sys/dev/usb/wlan/if_rsu.c
stable/11/sys/dev/usb/wlan/if_rsureg.h
stable/11/sys/dev/usb/wlan/if_rumvar.h
stable/11/sys/dev/usb/wlan/if_run.c
stable/11/sys/dev/usb/wlan/if_runvar.h
stable/11/sys/dev/usb/wlan/if_uathvar.h
stable/11/sys/dev/usb/wlan/if_upgtvar.h
stable/11/sys/dev/usb/wlan/if_uralvar.h
stable/11/sys/dev/usb/wlan/if_urtw.c
stable/11/sys/dev/usb/wlan/if_urtwvar.h
stable/11/sys/dev/usb/wlan/if_zydreg.h
stable/11/sys/dev/wi/if_wireg.h
stable/11/sys/dev/wpi/if_wpivar.h
stable/11/sys/dev/wtap/if_wtapioctl.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/share/man/man9/ieee80211_radiotap.9
==
--- stable/11/share/man/man9/ieee80211_radiotap.9 Thu Mar 28 09:18:22
2019(r345635)
+++ stable/11/share/man/man9/ieee80211_radiotap.9 Thu Mar 28 09:50:25
2019(r345636)
@@ -27,7 +27,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd August 4, 2009
+.Dd March 28, 2019
.Dt IEEE80211_RADIOTAP 9
.Os
.Sh NAME
@@ -257,7 +257,7 @@ struct wi_rx_radiotap_header {
uint16_t wr_chan_flags;
uint8_twr_antsignal;
uint8_twr_antnoise;
-} __packed;
+} __packed __aligned(8);
.Ed
.Pp
and transmit definitions for the Atheros driver:
Modified: stable/11/sys/dev/ath/if_athioctl.h
==
--- stable/11/sys/dev/ath/if_athioctl.h Thu Mar 28 09:18:22 2019
(r345635)
+++ stable/11/sys/dev/ath/if_athioctl.h Thu Mar 28 09:50:25 2019
(r345636)
@@ -371,7 +371,7 @@ struct ath_rx_radiotap_header {
*/
struct ath_radiotap_vendor_hdr wr_v;
#endif /* ATH_ENABLE_RADIOTAP_VENDOR_EXT */
-} __packed;
+} __packed __aligned(8);
#define ATH_TX_RADIOTAP_PRESENT ( \
(1 << IEEE80211_RADIOTAP_FLAGS) | \
Modified: stable/11/sys/dev/bwi/if_bwi.c
==
--- stable/11/sys/dev/bwi/if_bwi.c Thu Mar 28 09:18:22 2019
(r345635)
+++ stable/11/sys/dev/bwi/if_bwi.c Thu Mar 28 09:50:25 2019
(r345636)
@@ -1727,15 +1727,6 @@ bwi_set_channel(struct ieee80211com *ic)
bwi_rf_set_chan(mac, ieee80211_chan2ieee(ic, c), 0);
sc->sc_rates = ieee80211_get_ratetable(c);
-
- /*
-* Setup radio tap channel freq and flags
-*/
- sc->sc_tx_th.wt_chan_freq = sc->sc_rx_th.wr_chan_freq =
- htole16(c->ic_freq);
- sc->sc_tx_th.wt_chan_flags = sc->sc_rx_th.wr_chan_flags =
- htole16(c->ic_flags & 0x);
-
BWI_UNLOCK(sc);
}
Modified: stable/11/sys/dev/bwi/if_bwivar.h
==
--- stable/11/sys/dev/bwi/if_bwivar.h Thu Mar 28 09:18:22 2019
(r345635)
+++ stable/11/sys/dev/bwi/if_bwivar.h Thu Mar 28 09:50:25 2019
(r345636)
@@ -511,7 +511,7 @@ struct bwi_tx_radiotap_hdr {
uint8_t wt_rate;
uint16_twt_chan_freq;
uint16_twt_chan_flags;
-};
+} __packed;
#define BWI_RX_RADIOTAP_PRESENT\
((1 << IEEE80211_RADIOTAP_TSFT) | \
@@ -531,7 +531,7 @@ struct bwi_r
svn commit: r345729 - head/sys/dev/usb/wlan
Author: avos
Date: Sat Mar 30 09:24:06 2019
New Revision: 345729
URL: https://svnweb.freebsd.org/changeset/base/345729
Log:
urtw(4): export TSF timestamp for received frames via radiotap
Tested with Netgear WG111 v3 (RTL8187B), STA mode.
MFC after:1 week
Modified:
head/sys/dev/usb/wlan/if_urtw.c
head/sys/dev/usb/wlan/if_urtwvar.h
Modified: head/sys/dev/usb/wlan/if_urtw.c
==
--- head/sys/dev/usb/wlan/if_urtw.c Sat Mar 30 07:29:20 2019
(r345728)
+++ head/sys/dev/usb/wlan/if_urtw.c Sat Mar 30 09:24:06 2019
(r345729)
@@ -3932,6 +3932,7 @@ urtw_rxeof(struct usb_xfer *xfer, struct urtw_data *da
struct urtw_softc *sc = data->sc;
struct ieee80211com *ic = &sc->sc_ic;
uint8_t noise = 0, rate;
+ uint64_t mactime;
usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL);
@@ -3951,6 +3952,9 @@ urtw_rxeof(struct usb_xfer *xfer, struct urtw_data *da
/* XXX correct? */
rssi = rx->rssi & URTW_RX_RSSI_MASK;
noise = rx->noise;
+
+ if (ieee80211_radiotap_active(ic))
+ mactime = rx->mactime;
} else {
struct urtw_8187l_rxhdr *rx;
@@ -3967,6 +3971,9 @@ urtw_rxeof(struct usb_xfer *xfer, struct urtw_data *da
/* XXX correct? */
rssi = rx->rssi & URTW_RX_8187L_RSSI_MASK;
noise = rx->noise;
+
+ if (ieee80211_radiotap_active(ic))
+ mactime = rx->mactime;
}
if (flen < IEEE80211_ACK_LEN)
@@ -3986,6 +3993,7 @@ urtw_rxeof(struct usb_xfer *xfer, struct urtw_data *da
if (ieee80211_radiotap_active(ic)) {
struct urtw_rx_radiotap_header *tap = &sc->sc_rxtap;
+ tap->wr_tsf = mactime;
tap->wr_flags = 0;
tap->wr_dbm_antsignal = (int8_t)rssi;
}
Modified: head/sys/dev/usb/wlan/if_urtwvar.h
==
--- head/sys/dev/usb/wlan/if_urtwvar.h Sat Mar 30 07:29:20 2019
(r345728)
+++ head/sys/dev/usb/wlan/if_urtwvar.h Sat Mar 30 09:24:06 2019
(r345729)
@@ -55,6 +55,7 @@ typedef STAILQ_HEAD(, urtw_data) urtw_datahead;
struct urtw_rx_radiotap_header {
struct ieee80211_radiotap_header wr_ihdr;
+ uint64_twr_tsf;
uint8_t wr_flags;
uint8_t wr_pad;
uint16_twr_chan_freq;
@@ -63,7 +64,8 @@ struct urtw_rx_radiotap_header {
} __packed __aligned(8);
#define URTW_RX_RADIOTAP_PRESENT \
- ((1 << IEEE80211_RADIOTAP_FLAGS) | \
+ ((1 << IEEE80211_RADIOTAP_TSFT) | \
+(1 << IEEE80211_RADIOTAP_FLAGS) | \
(1 << IEEE80211_RADIOTAP_CHANNEL) |\
(1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL))
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r345752 - in stable: 11/sys/dev/usb/wlan 12/sys/dev/usb/wlan
Author: avos
Date: Sun Mar 31 11:31:01 2019
New Revision: 345752
URL: https://svnweb.freebsd.org/changeset/base/345752
Log:
MFC r345493:
run(4): merge some common TSF-related code into run_disable_tsf()
No functional change intended.
Modified:
stable/11/sys/dev/usb/wlan/if_run.c
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/12/sys/dev/usb/wlan/if_run.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/11/sys/dev/usb/wlan/if_run.c
==
--- stable/11/sys/dev/usb/wlan/if_run.c Sun Mar 31 09:52:36 2019
(r345751)
+++ stable/11/sys/dev/usb/wlan/if_run.c Sun Mar 31 11:31:01 2019
(r345752)
@@ -431,6 +431,7 @@ static void run_usb_timeout_cb(void *);
static voidrun_reset_livelock(struct run_softc *);
static voidrun_enable_tsf_sync(struct run_softc *);
static voidrun_enable_tsf(struct run_softc *);
+static voidrun_disable_tsf(struct run_softc *);
static voidrun_get_tsf(struct run_softc *, uint64_t *);
static voidrun_enable_mrr(struct run_softc *);
static voidrun_set_txpreamble(struct run_softc *);
@@ -2042,7 +2043,6 @@ run_newstate(struct ieee80211vap *vap, enum ieee80211_
struct run_vap *rvp = RUN_VAP(vap);
enum ieee80211_state ostate;
uint32_t sta[3];
- uint32_t tmp;
uint8_t ratectl;
uint8_t restart_ratectl = 0;
uint8_t bid = 1 << rvp->rvp_id;
@@ -2075,12 +2075,8 @@ run_newstate(struct ieee80211vap *vap, enum ieee80211_
sc->runbmap &= ~bid;
/* abort TSF synchronization if there is no vap running */
- if (--sc->running == 0) {
- run_read(sc, RT2860_BCN_TIME_CFG, &tmp);
- run_write(sc, RT2860_BCN_TIME_CFG,
- tmp & ~(RT2860_BCN_TX_EN | RT2860_TSF_TIMER_EN |
- RT2860_TBTT_TIMER_EN));
- }
+ if (--sc->running == 0)
+ run_disable_tsf(sc);
break;
case IEEE80211_S_RUN:
@@ -4816,15 +4812,11 @@ static void
run_scan_start(struct ieee80211com *ic)
{
struct run_softc *sc = ic->ic_softc;
- uint32_t tmp;
RUN_LOCK(sc);
/* abort TSF synchronization */
- run_read(sc, RT2860_BCN_TIME_CFG, &tmp);
- run_write(sc, RT2860_BCN_TIME_CFG,
- tmp & ~(RT2860_BCN_TX_EN | RT2860_TSF_TIMER_EN |
- RT2860_TBTT_TIMER_EN));
+ run_disable_tsf(sc);
run_set_bssid(sc, ieee80211broadcastaddr);
RUN_UNLOCK(sc);
@@ -5107,6 +5099,18 @@ run_enable_tsf(struct run_softc *sc)
}
static void
+run_disable_tsf(struct run_softc *sc)
+{
+ uint32_t tmp;
+
+ if (run_read(sc, RT2860_BCN_TIME_CFG, &tmp) == 0) {
+ tmp &= ~(RT2860_BCN_TX_EN | RT2860_TSF_TIMER_EN |
+ RT2860_TBTT_TIMER_EN);
+ run_write(sc, RT2860_BCN_TIME_CFG, tmp);
+ }
+}
+
+static void
run_get_tsf(struct run_softc *sc, uint64_t *buf)
{
run_read_region_1(sc, RT2860_TSF_TIMER_DW0, (uint8_t *)buf,
@@ -6057,10 +6061,7 @@ run_init_locked(struct run_softc *sc)
}
/* abort TSF synchronization */
- run_read(sc, RT2860_BCN_TIME_CFG, &tmp);
- tmp &= ~(RT2860_BCN_TX_EN | RT2860_TSF_TIMER_EN |
- RT2860_TBTT_TIMER_EN);
- run_write(sc, RT2860_BCN_TIME_CFG, tmp);
+ run_disable_tsf(sc);
/* clear RX WCID search table */
run_set_region_4(sc, RT2860_WCID_ENTRY(0), 0, 512);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r345751 - head/sys/dev/usb/wlan
Author: avos
Date: Sun Mar 31 09:52:36 2019
New Revision: 345751
URL: https://svnweb.freebsd.org/changeset/base/345751
Log:
uath(4), urtw(4): restart driver if device does not respond after Tx request
MFC after:1 week
Modified:
head/sys/dev/usb/wlan/if_uath.c
head/sys/dev/usb/wlan/if_urtw.c
Modified: head/sys/dev/usb/wlan/if_uath.c
==
--- head/sys/dev/usb/wlan/if_uath.c Sun Mar 31 06:21:32 2019
(r345750)
+++ head/sys/dev/usb/wlan/if_uath.c Sun Mar 31 09:52:36 2019
(r345751)
@@ -1276,8 +1276,8 @@ uath_watchdog(void *arg)
if (sc->sc_tx_timer > 0) {
if (--sc->sc_tx_timer == 0) {
device_printf(sc->sc_dev, "device timeout\n");
- /*uath_init(sc); XXX needs a process context! */
counter_u64_add(ic->ic_oerrors, 1);
+ ieee80211_restart_all(ic);
return;
}
callout_reset(&sc->watchdog_ch, hz, uath_watchdog, sc);
Modified: head/sys/dev/usb/wlan/if_urtw.c
==
--- head/sys/dev/usb/wlan/if_urtw.c Sun Mar 31 06:21:32 2019
(r345750)
+++ head/sys/dev/usb/wlan/if_urtw.c Sun Mar 31 09:52:36 2019
(r345751)
@@ -1891,11 +1891,13 @@ static void
urtw_watchdog(void *arg)
{
struct urtw_softc *sc = arg;
+ struct ieee80211com *ic = &sc->sc_ic;
if (sc->sc_txtimer > 0) {
if (--sc->sc_txtimer == 0) {
device_printf(sc->sc_dev, "device timeout\n");
- counter_u64_add(sc->sc_ic.ic_oerrors, 1);
+ counter_u64_add(ic->ic_oerrors, 1);
+ ieee80211_restart_all(ic);
return;
}
callout_reset(&sc->sc_watchdog_ch, hz, urtw_watchdog, sc);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r345753 - head/sys/dev/usb/wlan
Author: avos
Date: Sun Mar 31 13:41:20 2019
New Revision: 345753
URL: https://svnweb.freebsd.org/changeset/base/345753
Log:
run(4): do not clear PROTECTED bit if frame was not decrypted by NIC.
Tested with D-Link DWA-140 rev B3, STA / MONITOR modes.
MFC after:1 week
Modified:
head/sys/dev/usb/wlan/if_run.c
Modified: head/sys/dev/usb/wlan/if_run.c
==
--- head/sys/dev/usb/wlan/if_run.c Sun Mar 31 11:31:01 2019
(r345752)
+++ head/sys/dev/usb/wlan/if_run.c Sun Mar 31 13:41:20 2019
(r345753)
@@ -2865,8 +2865,8 @@ run_rx_frame(struct run_softc *sc, struct mbuf *m, uin
wh = mtod(m, struct ieee80211_frame *);
- /* XXX wrong for monitor mode */
- if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
+ if ((wh->i_fc[1] & IEEE80211_FC1_PROTECTED) != 0 &&
+ (flags & RT2860_RX_DEC) != 0) {
wh->i_fc[1] &= ~IEEE80211_FC1_PROTECTED;
m->m_flags |= M_WEP;
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r345754 - head/sys/dev/usb/wlan
Author: avos
Date: Sun Mar 31 14:18:02 2019
New Revision: 345754
URL: https://svnweb.freebsd.org/changeset/base/345754
Log:
run(4): properly set F_DATAPAD radiotap flag if frame has padding between
frame header and data.
This will fix 'Mysterious OLPC stuff' for received frames and wrong
CCMP / TKIP / data decoding for transmitted frames in net/wireshark
dissector.
While here, drop unneeded comment - net80211 handles padding requirements
for Tx & Rx without driver adjustment.
Tested with D-Link DWA-140 rev B3, STA mode.
MFC after:1 week
Modified:
head/sys/dev/usb/wlan/if_run.c
Modified: head/sys/dev/usb/wlan/if_run.c
==
--- head/sys/dev/usb/wlan/if_run.c Sun Mar 31 13:41:20 2019
(r345753)
+++ head/sys/dev/usb/wlan/if_run.c Sun Mar 31 14:18:02 2019
(r345754)
@@ -2851,10 +2851,6 @@ run_rx_frame(struct run_softc *sc, struct mbuf *m, uin
}
if (flags & RT2860_RX_L2PAD) {
- /*
-* XXX OpenBSD removes padding between header
-* and payload here...
-*/
RUN_DPRINTF(sc, RUN_DEBUG_RECV,
"received RT2860_RX_L2PAD frame\n");
len += 2;
@@ -2896,6 +2892,8 @@ run_rx_frame(struct run_softc *sc, struct mbuf *m, uin
uint16_t phy;
tap->wr_flags = 0;
+ if (flags & RT2860_RX_L2PAD)
+ tap->wr_flags |= IEEE80211_RADIOTAP_F_DATAPAD;
tap->wr_antsignal = rssi;
tap->wr_antenna = ant;
tap->wr_dbm_antsignal = run_rssi2dbm(sc, rssi, ant);
@@ -3162,14 +3160,23 @@ tr_setup:
vap = data->ni->ni_vap;
if (ieee80211_radiotap_active_vap(vap)) {
+ const struct ieee80211_frame *wh;
struct run_tx_radiotap_header *tap = &sc->sc_txtap;
struct rt2860_txwi *txwi =
(struct rt2860_txwi *)(&data->desc + sizeof(struct
rt2870_txd));
+ int has_l2pad;
+
+ wh = mtod(m, struct ieee80211_frame *);
+ has_l2pad = IEEE80211_HAS_ADDR4(wh) !=
+ IEEE80211_QOS_HAS_SEQ(wh);
+
tap->wt_flags = 0;
tap->wt_rate = rt2860_rates[data->ridx].rate;
tap->wt_hwqueue = index;
if (le16toh(txwi->phy) & RT2860_PHY_SHPRE)
tap->wt_flags |= IEEE80211_RADIOTAP_F_SHORTPRE;
+ if (has_l2pad)
+ tap->wt_flags |= IEEE80211_RADIOTAP_F_DATAPAD;
ieee80211_radiotap_tx(vap, m);
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r345752 - in stable: 11/sys/dev/usb/wlan 12/sys/dev/usb/wlan
Author: avos
Date: Sun Mar 31 11:31:01 2019
New Revision: 345752
URL: https://svnweb.freebsd.org/changeset/base/345752
Log:
MFC r345493:
run(4): merge some common TSF-related code into run_disable_tsf()
No functional change intended.
Modified:
stable/12/sys/dev/usb/wlan/if_run.c
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/sys/dev/usb/wlan/if_run.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/12/sys/dev/usb/wlan/if_run.c
==
--- stable/12/sys/dev/usb/wlan/if_run.c Sun Mar 31 09:52:36 2019
(r345751)
+++ stable/12/sys/dev/usb/wlan/if_run.c Sun Mar 31 11:31:01 2019
(r345752)
@@ -464,6 +464,7 @@ static void run_usb_timeout_cb(void *);
static voidrun_reset_livelock(struct run_softc *);
static voidrun_enable_tsf_sync(struct run_softc *);
static voidrun_enable_tsf(struct run_softc *);
+static voidrun_disable_tsf(struct run_softc *);
static voidrun_get_tsf(struct run_softc *, uint64_t *);
static voidrun_enable_mrr(struct run_softc *);
static voidrun_set_txpreamble(struct run_softc *);
@@ -2090,7 +2091,6 @@ run_newstate(struct ieee80211vap *vap, enum ieee80211_
struct run_vap *rvp = RUN_VAP(vap);
enum ieee80211_state ostate;
uint32_t sta[3];
- uint32_t tmp;
uint8_t ratectl;
uint8_t restart_ratectl = 0;
uint8_t bid = 1 << rvp->rvp_id;
@@ -2123,12 +2123,8 @@ run_newstate(struct ieee80211vap *vap, enum ieee80211_
sc->runbmap &= ~bid;
/* abort TSF synchronization if there is no vap running */
- if (--sc->running == 0) {
- run_read(sc, RT2860_BCN_TIME_CFG, &tmp);
- run_write(sc, RT2860_BCN_TIME_CFG,
- tmp & ~(RT2860_BCN_TX_EN | RT2860_TSF_TIMER_EN |
- RT2860_TBTT_TIMER_EN));
- }
+ if (--sc->running == 0)
+ run_disable_tsf(sc);
break;
case IEEE80211_S_RUN:
@@ -4863,15 +4859,11 @@ static void
run_scan_start(struct ieee80211com *ic)
{
struct run_softc *sc = ic->ic_softc;
- uint32_t tmp;
RUN_LOCK(sc);
/* abort TSF synchronization */
- run_read(sc, RT2860_BCN_TIME_CFG, &tmp);
- run_write(sc, RT2860_BCN_TIME_CFG,
- tmp & ~(RT2860_BCN_TX_EN | RT2860_TSF_TIMER_EN |
- RT2860_TBTT_TIMER_EN));
+ run_disable_tsf(sc);
run_set_bssid(sc, ieee80211broadcastaddr);
RUN_UNLOCK(sc);
@@ -5158,6 +5150,18 @@ run_enable_tsf(struct run_softc *sc)
}
static void
+run_disable_tsf(struct run_softc *sc)
+{
+ uint32_t tmp;
+
+ if (run_read(sc, RT2860_BCN_TIME_CFG, &tmp) == 0) {
+ tmp &= ~(RT2860_BCN_TX_EN | RT2860_TSF_TIMER_EN |
+ RT2860_TBTT_TIMER_EN);
+ run_write(sc, RT2860_BCN_TIME_CFG, tmp);
+ }
+}
+
+static void
run_get_tsf(struct run_softc *sc, uint64_t *buf)
{
run_read_region_1(sc, RT2860_TSF_TIMER_DW0, (uint8_t *)buf,
@@ -6108,10 +6112,7 @@ run_init_locked(struct run_softc *sc)
}
/* abort TSF synchronization */
- run_read(sc, RT2860_BCN_TIME_CFG, &tmp);
- tmp &= ~(RT2860_BCN_TX_EN | RT2860_TSF_TIMER_EN |
- RT2860_TBTT_TIMER_EN);
- run_write(sc, RT2860_BCN_TIME_CFG, tmp);
+ run_disable_tsf(sc);
/* clear RX WCID search table */
run_set_region_4(sc, RT2860_WCID_ENTRY(0), 0, 512);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r345761 - in stable: 10/sys/net80211 11/sys/net80211 12/sys/net80211
Author: avos Date: Mon Apr 1 07:54:27 2019 New Revision: 345761 URL: https://svnweb.freebsd.org/changeset/base/345761 Log: MFC r345252: net80211: correct check for SMPS node flags updates Update node flags when driver supports SMPS, not when it is disabled or in dynamic mode ((iv_htcaps & HTCAP_SMPS) != 0). Was checked with RTL8188EE (1T1R), STA mode - 'smps' word should disappear from 'ifconfig wlan0' output. Modified: stable/10/sys/net80211/ieee80211_ht.c Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/11/sys/net80211/ieee80211_ht.c stable/12/sys/net80211/ieee80211_ht.c Directory Properties: stable/11/ (props changed) stable/12/ (props changed) Modified: stable/10/sys/net80211/ieee80211_ht.c == --- stable/10/sys/net80211/ieee80211_ht.c Mon Apr 1 07:46:41 2019 (r345760) +++ stable/10/sys/net80211/ieee80211_ht.c Mon Apr 1 07:54:27 2019 (r345761) @@ -1542,7 +1542,7 @@ ieee80211_ht_updateparams(struct ieee80211_node *ni, int ret = 0; ieee80211_parse_htcap(ni, htcapie); - if (vap->iv_htcaps & IEEE80211_HTCAP_SMPS) + if (vap->iv_htcaps & IEEE80211_HTC_SMPS) htcap_update_mimo_ps(ni); htcap_update_shortgi(ni); @@ -1584,7 +1584,7 @@ ieee80211_ht_updatehtcap(struct ieee80211_node *ni, co int htflags; ieee80211_parse_htcap(ni, htcapie); - if (vap->iv_htcaps & IEEE80211_HTCAP_SMPS) + if (vap->iv_htcaps & IEEE80211_HTC_SMPS) htcap_update_mimo_ps(ni); htcap_update_shortgi(ni); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r345761 - in stable: 10/sys/net80211 11/sys/net80211 12/sys/net80211
Author: avos Date: Mon Apr 1 07:54:27 2019 New Revision: 345761 URL: https://svnweb.freebsd.org/changeset/base/345761 Log: MFC r345252: net80211: correct check for SMPS node flags updates Update node flags when driver supports SMPS, not when it is disabled or in dynamic mode ((iv_htcaps & HTCAP_SMPS) != 0). Was checked with RTL8188EE (1T1R), STA mode - 'smps' word should disappear from 'ifconfig wlan0' output. Modified: stable/11/sys/net80211/ieee80211_ht.c Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/net80211/ieee80211_ht.c stable/12/sys/net80211/ieee80211_ht.c Directory Properties: stable/10/ (props changed) stable/12/ (props changed) Modified: stable/11/sys/net80211/ieee80211_ht.c == --- stable/11/sys/net80211/ieee80211_ht.c Mon Apr 1 07:46:41 2019 (r345760) +++ stable/11/sys/net80211/ieee80211_ht.c Mon Apr 1 07:54:27 2019 (r345761) @@ -1567,7 +1567,7 @@ ieee80211_ht_updateparams(struct ieee80211_node *ni, int ret = 0; ieee80211_parse_htcap(ni, htcapie); - if (vap->iv_htcaps & IEEE80211_HTCAP_SMPS) + if (vap->iv_htcaps & IEEE80211_HTC_SMPS) htcap_update_mimo_ps(ni); htcap_update_shortgi(ni); @@ -1609,7 +1609,7 @@ ieee80211_ht_updatehtcap(struct ieee80211_node *ni, co int htflags; ieee80211_parse_htcap(ni, htcapie); - if (vap->iv_htcaps & IEEE80211_HTCAP_SMPS) + if (vap->iv_htcaps & IEEE80211_HTC_SMPS) htcap_update_mimo_ps(ni); htcap_update_shortgi(ni); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r345761 - in stable: 10/sys/net80211 11/sys/net80211 12/sys/net80211
Author: avos Date: Mon Apr 1 07:54:27 2019 New Revision: 345761 URL: https://svnweb.freebsd.org/changeset/base/345761 Log: MFC r345252: net80211: correct check for SMPS node flags updates Update node flags when driver supports SMPS, not when it is disabled or in dynamic mode ((iv_htcaps & HTCAP_SMPS) != 0). Was checked with RTL8188EE (1T1R), STA mode - 'smps' word should disappear from 'ifconfig wlan0' output. Modified: stable/12/sys/net80211/ieee80211_ht.c Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/net80211/ieee80211_ht.c stable/11/sys/net80211/ieee80211_ht.c Directory Properties: stable/10/ (props changed) stable/11/ (props changed) Modified: stable/12/sys/net80211/ieee80211_ht.c == --- stable/12/sys/net80211/ieee80211_ht.c Mon Apr 1 07:46:41 2019 (r345760) +++ stable/12/sys/net80211/ieee80211_ht.c Mon Apr 1 07:54:27 2019 (r345761) @@ -1727,7 +1727,7 @@ ieee80211_ht_updateparams(struct ieee80211_node *ni, const struct ieee80211_ie_htinfo *htinfo; ieee80211_parse_htcap(ni, htcapie); - if (vap->iv_htcaps & IEEE80211_HTCAP_SMPS) + if (vap->iv_htcaps & IEEE80211_HTC_SMPS) htcap_update_mimo_ps(ni); htcap_update_shortgi(ni); htcap_update_ldpc(ni); @@ -1880,7 +1880,7 @@ ieee80211_ht_updatehtcap(struct ieee80211_node *ni, co struct ieee80211vap *vap = ni->ni_vap; ieee80211_parse_htcap(ni, htcapie); - if (vap->iv_htcaps & IEEE80211_HTCAP_SMPS) + if (vap->iv_htcaps & IEEE80211_HTC_SMPS) htcap_update_mimo_ps(ni); htcap_update_shortgi(ni); htcap_update_ldpc(ni); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r346003 - in stable: 11/sys/dev/usb/wlan 12/sys/dev/usb/wlan
Author: avos
Date: Sun Apr 7 12:57:38 2019
New Revision: 346003
URL: https://svnweb.freebsd.org/changeset/base/346003
Log:
MFC r345729:
urtw(4): export TSF timestamp for received frames via radiotap
Was tested with Netgear WG111 v3 (RTL8187B), STA mode.
Modified:
stable/11/sys/dev/usb/wlan/if_urtw.c
stable/11/sys/dev/usb/wlan/if_urtwvar.h
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/12/sys/dev/usb/wlan/if_urtw.c
stable/12/sys/dev/usb/wlan/if_urtwvar.h
Directory Properties:
stable/12/ (props changed)
Modified: stable/11/sys/dev/usb/wlan/if_urtw.c
==
--- stable/11/sys/dev/usb/wlan/if_urtw.cSun Apr 7 12:20:17 2019
(r346002)
+++ stable/11/sys/dev/usb/wlan/if_urtw.cSun Apr 7 12:57:38 2019
(r346003)
@@ -3937,6 +3937,7 @@ urtw_rxeof(struct usb_xfer *xfer, struct urtw_data *da
struct urtw_softc *sc = data->sc;
struct ieee80211com *ic = &sc->sc_ic;
uint8_t noise = 0, rate;
+ uint64_t mactime;
usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL);
@@ -3956,6 +3957,9 @@ urtw_rxeof(struct usb_xfer *xfer, struct urtw_data *da
/* XXX correct? */
rssi = rx->rssi & URTW_RX_RSSI_MASK;
noise = rx->noise;
+
+ if (ieee80211_radiotap_active(ic))
+ mactime = rx->mactime;
} else {
struct urtw_8187l_rxhdr *rx;
@@ -3972,6 +3976,9 @@ urtw_rxeof(struct usb_xfer *xfer, struct urtw_data *da
/* XXX correct? */
rssi = rx->rssi & URTW_RX_8187L_RSSI_MASK;
noise = rx->noise;
+
+ if (ieee80211_radiotap_active(ic))
+ mactime = rx->mactime;
}
if (flen < IEEE80211_ACK_LEN)
@@ -3991,6 +3998,7 @@ urtw_rxeof(struct usb_xfer *xfer, struct urtw_data *da
if (ieee80211_radiotap_active(ic)) {
struct urtw_rx_radiotap_header *tap = &sc->sc_rxtap;
+ tap->wr_tsf = mactime;
tap->wr_flags = 0;
tap->wr_dbm_antsignal = (int8_t)rssi;
}
Modified: stable/11/sys/dev/usb/wlan/if_urtwvar.h
==
--- stable/11/sys/dev/usb/wlan/if_urtwvar.h Sun Apr 7 12:20:17 2019
(r346002)
+++ stable/11/sys/dev/usb/wlan/if_urtwvar.h Sun Apr 7 12:57:38 2019
(r346003)
@@ -55,6 +55,7 @@ typedef STAILQ_HEAD(, urtw_data) urtw_datahead;
struct urtw_rx_radiotap_header {
struct ieee80211_radiotap_header wr_ihdr;
+ uint64_twr_tsf;
uint8_t wr_flags;
uint8_t wr_pad;
uint16_twr_chan_freq;
@@ -63,7 +64,8 @@ struct urtw_rx_radiotap_header {
} __packed __aligned(8);
#define URTW_RX_RADIOTAP_PRESENT \
- ((1 << IEEE80211_RADIOTAP_FLAGS) | \
+ ((1 << IEEE80211_RADIOTAP_TSFT) | \
+(1 << IEEE80211_RADIOTAP_FLAGS) | \
(1 << IEEE80211_RADIOTAP_CHANNEL) |\
(1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL))
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r346003 - in stable: 11/sys/dev/usb/wlan 12/sys/dev/usb/wlan
Author: avos
Date: Sun Apr 7 12:57:38 2019
New Revision: 346003
URL: https://svnweb.freebsd.org/changeset/base/346003
Log:
MFC r345729:
urtw(4): export TSF timestamp for received frames via radiotap
Was tested with Netgear WG111 v3 (RTL8187B), STA mode.
Modified:
stable/12/sys/dev/usb/wlan/if_urtw.c
stable/12/sys/dev/usb/wlan/if_urtwvar.h
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/sys/dev/usb/wlan/if_urtw.c
stable/11/sys/dev/usb/wlan/if_urtwvar.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/12/sys/dev/usb/wlan/if_urtw.c
==
--- stable/12/sys/dev/usb/wlan/if_urtw.cSun Apr 7 12:20:17 2019
(r346002)
+++ stable/12/sys/dev/usb/wlan/if_urtw.cSun Apr 7 12:57:38 2019
(r346003)
@@ -3932,6 +3932,7 @@ urtw_rxeof(struct usb_xfer *xfer, struct urtw_data *da
struct urtw_softc *sc = data->sc;
struct ieee80211com *ic = &sc->sc_ic;
uint8_t noise = 0, rate;
+ uint64_t mactime;
usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL);
@@ -3951,6 +3952,9 @@ urtw_rxeof(struct usb_xfer *xfer, struct urtw_data *da
/* XXX correct? */
rssi = rx->rssi & URTW_RX_RSSI_MASK;
noise = rx->noise;
+
+ if (ieee80211_radiotap_active(ic))
+ mactime = rx->mactime;
} else {
struct urtw_8187l_rxhdr *rx;
@@ -3967,6 +3971,9 @@ urtw_rxeof(struct usb_xfer *xfer, struct urtw_data *da
/* XXX correct? */
rssi = rx->rssi & URTW_RX_8187L_RSSI_MASK;
noise = rx->noise;
+
+ if (ieee80211_radiotap_active(ic))
+ mactime = rx->mactime;
}
if (flen < IEEE80211_ACK_LEN)
@@ -3986,6 +3993,7 @@ urtw_rxeof(struct usb_xfer *xfer, struct urtw_data *da
if (ieee80211_radiotap_active(ic)) {
struct urtw_rx_radiotap_header *tap = &sc->sc_rxtap;
+ tap->wr_tsf = mactime;
tap->wr_flags = 0;
tap->wr_dbm_antsignal = (int8_t)rssi;
}
Modified: stable/12/sys/dev/usb/wlan/if_urtwvar.h
==
--- stable/12/sys/dev/usb/wlan/if_urtwvar.h Sun Apr 7 12:20:17 2019
(r346002)
+++ stable/12/sys/dev/usb/wlan/if_urtwvar.h Sun Apr 7 12:57:38 2019
(r346003)
@@ -55,6 +55,7 @@ typedef STAILQ_HEAD(, urtw_data) urtw_datahead;
struct urtw_rx_radiotap_header {
struct ieee80211_radiotap_header wr_ihdr;
+ uint64_twr_tsf;
uint8_t wr_flags;
uint8_t wr_pad;
uint16_twr_chan_freq;
@@ -63,7 +64,8 @@ struct urtw_rx_radiotap_header {
} __packed __aligned(8);
#define URTW_RX_RADIOTAP_PRESENT \
- ((1 << IEEE80211_RADIOTAP_FLAGS) | \
+ ((1 << IEEE80211_RADIOTAP_TSFT) | \
+(1 << IEEE80211_RADIOTAP_FLAGS) | \
(1 << IEEE80211_RADIOTAP_CHANNEL) |\
(1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL))
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r346004 - in stable: 11/sys/dev/usb/wlan 12/sys/dev/usb/wlan
Author: avos
Date: Sun Apr 7 13:04:25 2019
New Revision: 346004
URL: https://svnweb.freebsd.org/changeset/base/346004
Log:
MFC r345753:
run(4): do not clear PROTECTED bit if frame was not decrypted by NIC.
Was tested with D-Link DWA-140 rev B3, STA / MONITOR modes.
Modified:
stable/12/sys/dev/usb/wlan/if_run.c
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/sys/dev/usb/wlan/if_run.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/12/sys/dev/usb/wlan/if_run.c
==
--- stable/12/sys/dev/usb/wlan/if_run.c Sun Apr 7 12:57:38 2019
(r346003)
+++ stable/12/sys/dev/usb/wlan/if_run.c Sun Apr 7 13:04:25 2019
(r346004)
@@ -2865,8 +2865,8 @@ run_rx_frame(struct run_softc *sc, struct mbuf *m, uin
wh = mtod(m, struct ieee80211_frame *);
- /* XXX wrong for monitor mode */
- if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
+ if ((wh->i_fc[1] & IEEE80211_FC1_PROTECTED) != 0 &&
+ (flags & RT2860_RX_DEC) != 0) {
wh->i_fc[1] &= ~IEEE80211_FC1_PROTECTED;
m->m_flags |= M_WEP;
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r346004 - in stable: 11/sys/dev/usb/wlan 12/sys/dev/usb/wlan
Author: avos
Date: Sun Apr 7 13:04:25 2019
New Revision: 346004
URL: https://svnweb.freebsd.org/changeset/base/346004
Log:
MFC r345753:
run(4): do not clear PROTECTED bit if frame was not decrypted by NIC.
Was tested with D-Link DWA-140 rev B3, STA / MONITOR modes.
Modified:
stable/11/sys/dev/usb/wlan/if_run.c
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/12/sys/dev/usb/wlan/if_run.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/11/sys/dev/usb/wlan/if_run.c
==
--- stable/11/sys/dev/usb/wlan/if_run.c Sun Apr 7 12:57:38 2019
(r346003)
+++ stable/11/sys/dev/usb/wlan/if_run.c Sun Apr 7 13:04:25 2019
(r346004)
@@ -2796,8 +2796,8 @@ run_rx_frame(struct run_softc *sc, struct mbuf *m, uin
wh = mtod(m, struct ieee80211_frame *);
- /* XXX wrong for monitor mode */
- if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
+ if ((wh->i_fc[1] & IEEE80211_FC1_PROTECTED) != 0 &&
+ (flags & RT2860_RX_DEC) != 0) {
wh->i_fc[1] &= ~IEEE80211_FC1_PROTECTED;
m->m_flags |= M_WEP;
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r346005 - in stable: 11/sys/dev/usb/wlan 12/sys/dev/usb/wlan
Author: avos
Date: Sun Apr 7 13:11:40 2019
New Revision: 346005
URL: https://svnweb.freebsd.org/changeset/base/346005
Log:
MFC r345751:
uath(4), urtw(4): restart driver if device does not respond after Tx request
Modified:
stable/11/sys/dev/usb/wlan/if_uath.c
stable/11/sys/dev/usb/wlan/if_urtw.c
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/12/sys/dev/usb/wlan/if_uath.c
stable/12/sys/dev/usb/wlan/if_urtw.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/11/sys/dev/usb/wlan/if_uath.c
==
--- stable/11/sys/dev/usb/wlan/if_uath.cSun Apr 7 13:04:25 2019
(r346004)
+++ stable/11/sys/dev/usb/wlan/if_uath.cSun Apr 7 13:11:40 2019
(r346005)
@@ -1271,8 +1271,8 @@ uath_watchdog(void *arg)
if (sc->sc_tx_timer > 0) {
if (--sc->sc_tx_timer == 0) {
device_printf(sc->sc_dev, "device timeout\n");
- /*uath_init(sc); XXX needs a process context! */
counter_u64_add(ic->ic_oerrors, 1);
+ ieee80211_restart_all(ic);
return;
}
callout_reset(&sc->watchdog_ch, hz, uath_watchdog, sc);
Modified: stable/11/sys/dev/usb/wlan/if_urtw.c
==
--- stable/11/sys/dev/usb/wlan/if_urtw.cSun Apr 7 13:04:25 2019
(r346004)
+++ stable/11/sys/dev/usb/wlan/if_urtw.cSun Apr 7 13:11:40 2019
(r346005)
@@ -1883,11 +1883,13 @@ static void
urtw_watchdog(void *arg)
{
struct urtw_softc *sc = arg;
+ struct ieee80211com *ic = &sc->sc_ic;
if (sc->sc_txtimer > 0) {
if (--sc->sc_txtimer == 0) {
device_printf(sc->sc_dev, "device timeout\n");
- counter_u64_add(sc->sc_ic.ic_oerrors, 1);
+ counter_u64_add(ic->ic_oerrors, 1);
+ ieee80211_restart_all(ic);
return;
}
callout_reset(&sc->sc_watchdog_ch, hz, urtw_watchdog, sc);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r346005 - in stable: 11/sys/dev/usb/wlan 12/sys/dev/usb/wlan
Author: avos
Date: Sun Apr 7 13:11:40 2019
New Revision: 346005
URL: https://svnweb.freebsd.org/changeset/base/346005
Log:
MFC r345751:
uath(4), urtw(4): restart driver if device does not respond after Tx request
Modified:
stable/12/sys/dev/usb/wlan/if_uath.c
stable/12/sys/dev/usb/wlan/if_urtw.c
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/sys/dev/usb/wlan/if_uath.c
stable/11/sys/dev/usb/wlan/if_urtw.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/12/sys/dev/usb/wlan/if_uath.c
==
--- stable/12/sys/dev/usb/wlan/if_uath.cSun Apr 7 13:04:25 2019
(r346004)
+++ stable/12/sys/dev/usb/wlan/if_uath.cSun Apr 7 13:11:40 2019
(r346005)
@@ -1276,8 +1276,8 @@ uath_watchdog(void *arg)
if (sc->sc_tx_timer > 0) {
if (--sc->sc_tx_timer == 0) {
device_printf(sc->sc_dev, "device timeout\n");
- /*uath_init(sc); XXX needs a process context! */
counter_u64_add(ic->ic_oerrors, 1);
+ ieee80211_restart_all(ic);
return;
}
callout_reset(&sc->watchdog_ch, hz, uath_watchdog, sc);
Modified: stable/12/sys/dev/usb/wlan/if_urtw.c
==
--- stable/12/sys/dev/usb/wlan/if_urtw.cSun Apr 7 13:04:25 2019
(r346004)
+++ stable/12/sys/dev/usb/wlan/if_urtw.cSun Apr 7 13:11:40 2019
(r346005)
@@ -1891,11 +1891,13 @@ static void
urtw_watchdog(void *arg)
{
struct urtw_softc *sc = arg;
+ struct ieee80211com *ic = &sc->sc_ic;
if (sc->sc_txtimer > 0) {
if (--sc->sc_txtimer == 0) {
device_printf(sc->sc_dev, "device timeout\n");
- counter_u64_add(sc->sc_ic.ic_oerrors, 1);
+ counter_u64_add(ic->ic_oerrors, 1);
+ ieee80211_restart_all(ic);
return;
}
callout_reset(&sc->sc_watchdog_ch, hz, urtw_watchdog, sc);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r346006 - in stable: 11/sys/dev/usb/wlan 12/sys/dev/usb/wlan
Author: avos
Date: Sun Apr 7 13:26:45 2019
New Revision: 346006
URL: https://svnweb.freebsd.org/changeset/base/346006
Log:
MFC r345754:
run(4): properly set F_DATAPAD radiotap flag if frame has padding between
frame header and data.
This will fix 'Mysterious OLPC stuff' for received frames and wrong
CCMP / TKIP / data decoding for transmitted frames in net/wireshark
dissector.
While here, drop unneeded comment - net80211 handles padding requirements
for Tx & Rx without driver adjustment.
Was tested with D-Link DWA-140 rev B3, STA mode.
Modified:
stable/12/sys/dev/usb/wlan/if_run.c
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/sys/dev/usb/wlan/if_run.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/12/sys/dev/usb/wlan/if_run.c
==
--- stable/12/sys/dev/usb/wlan/if_run.c Sun Apr 7 13:11:40 2019
(r346005)
+++ stable/12/sys/dev/usb/wlan/if_run.c Sun Apr 7 13:26:45 2019
(r346006)
@@ -2851,10 +2851,6 @@ run_rx_frame(struct run_softc *sc, struct mbuf *m, uin
}
if (flags & RT2860_RX_L2PAD) {
- /*
-* XXX OpenBSD removes padding between header
-* and payload here...
-*/
RUN_DPRINTF(sc, RUN_DEBUG_RECV,
"received RT2860_RX_L2PAD frame\n");
len += 2;
@@ -2896,6 +2892,8 @@ run_rx_frame(struct run_softc *sc, struct mbuf *m, uin
uint16_t phy;
tap->wr_flags = 0;
+ if (flags & RT2860_RX_L2PAD)
+ tap->wr_flags |= IEEE80211_RADIOTAP_F_DATAPAD;
tap->wr_antsignal = rssi;
tap->wr_antenna = ant;
tap->wr_dbm_antsignal = run_rssi2dbm(sc, rssi, ant);
@@ -3162,14 +3160,23 @@ tr_setup:
vap = data->ni->ni_vap;
if (ieee80211_radiotap_active_vap(vap)) {
+ const struct ieee80211_frame *wh;
struct run_tx_radiotap_header *tap = &sc->sc_txtap;
struct rt2860_txwi *txwi =
(struct rt2860_txwi *)(&data->desc + sizeof(struct
rt2870_txd));
+ int has_l2pad;
+
+ wh = mtod(m, struct ieee80211_frame *);
+ has_l2pad = IEEE80211_HAS_ADDR4(wh) !=
+ IEEE80211_QOS_HAS_SEQ(wh);
+
tap->wt_flags = 0;
tap->wt_rate = rt2860_rates[data->ridx].rate;
tap->wt_hwqueue = index;
if (le16toh(txwi->phy) & RT2860_PHY_SHPRE)
tap->wt_flags |= IEEE80211_RADIOTAP_F_SHORTPRE;
+ if (has_l2pad)
+ tap->wt_flags |= IEEE80211_RADIOTAP_F_DATAPAD;
ieee80211_radiotap_tx(vap, m);
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r346006 - in stable: 11/sys/dev/usb/wlan 12/sys/dev/usb/wlan
Author: avos
Date: Sun Apr 7 13:26:45 2019
New Revision: 346006
URL: https://svnweb.freebsd.org/changeset/base/346006
Log:
MFC r345754:
run(4): properly set F_DATAPAD radiotap flag if frame has padding between
frame header and data.
This will fix 'Mysterious OLPC stuff' for received frames and wrong
CCMP / TKIP / data decoding for transmitted frames in net/wireshark
dissector.
While here, drop unneeded comment - net80211 handles padding requirements
for Tx & Rx without driver adjustment.
Was tested with D-Link DWA-140 rev B3, STA mode.
Modified:
stable/11/sys/dev/usb/wlan/if_run.c
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/12/sys/dev/usb/wlan/if_run.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/11/sys/dev/usb/wlan/if_run.c
==
--- stable/11/sys/dev/usb/wlan/if_run.c Sun Apr 7 13:11:40 2019
(r346005)
+++ stable/11/sys/dev/usb/wlan/if_run.c Sun Apr 7 13:26:45 2019
(r346006)
@@ -2783,10 +2783,6 @@ run_rx_frame(struct run_softc *sc, struct mbuf *m, uin
}
if (flags & RT2860_RX_L2PAD) {
- /*
-* XXX OpenBSD removes padding between header
-* and payload here...
-*/
DPRINTFN(8, "received RT2860_RX_L2PAD frame\n");
len += 2;
}
@@ -2826,6 +2822,8 @@ run_rx_frame(struct run_softc *sc, struct mbuf *m, uin
uint16_t phy;
tap->wr_flags = 0;
+ if (flags & RT2860_RX_L2PAD)
+ tap->wr_flags |= IEEE80211_RADIOTAP_F_DATAPAD;
tap->wr_antsignal = rssi;
tap->wr_antenna = ant;
tap->wr_dbm_antsignal = run_rssi2dbm(sc, rssi, ant);
@@ -3085,14 +3083,23 @@ tr_setup:
vap = data->ni->ni_vap;
if (ieee80211_radiotap_active_vap(vap)) {
+ const struct ieee80211_frame *wh;
struct run_tx_radiotap_header *tap = &sc->sc_txtap;
struct rt2860_txwi *txwi =
(struct rt2860_txwi *)(&data->desc + sizeof(struct
rt2870_txd));
+ int has_l2pad;
+
+ wh = mtod(m, struct ieee80211_frame *);
+ has_l2pad = IEEE80211_HAS_ADDR4(wh) !=
+ IEEE80211_QOS_HAS_SEQ(wh);
+
tap->wt_flags = 0;
tap->wt_rate = rt2860_rates[data->ridx].rate;
tap->wt_hwqueue = index;
if (le16toh(txwi->phy) & RT2860_PHY_SHPRE)
tap->wt_flags |= IEEE80211_RADIOTAP_F_SHORTPRE;
+ if (has_l2pad)
+ tap->wt_flags |= IEEE80211_RADIOTAP_F_DATAPAD;
ieee80211_radiotap_tx(vap, m);
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r346073 - in head/sys/dev: iwi otus usb/wlan
Author: avos
Date: Wed Apr 10 08:17:56 2019
New Revision: 346073
URL: https://svnweb.freebsd.org/changeset/base/346073
Log:
urtw(4), otus(4), iwi(4): allow to set non-default MAC address via ifconfig(8)
Tested with Netgear WG111 v3 (RTL8187B, urtw(4)), STA mode.
MFC after:1 week
Modified:
head/sys/dev/iwi/if_iwi.c
head/sys/dev/otus/if_otus.c
head/sys/dev/usb/wlan/if_urtw.c
Modified: head/sys/dev/iwi/if_iwi.c
==
--- head/sys/dev/iwi/if_iwi.c Wed Apr 10 07:51:13 2019(r346072)
+++ head/sys/dev/iwi/if_iwi.c Wed Apr 10 08:17:56 2019(r346073)
@@ -2576,15 +2576,18 @@ static int
iwi_config(struct iwi_softc *sc)
{
struct ieee80211com *ic = &sc->sc_ic;
+ struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
struct iwi_configuration config;
struct iwi_txpower power;
+ uint8_t *macaddr;
uint32_t data;
int error, i;
IWI_LOCK_ASSERT(sc);
- DPRINTF(("Setting MAC address to %6D\n", ic->ic_macaddr, ":"));
- error = iwi_cmd(sc, IWI_CMD_SET_MAC_ADDRESS, ic->ic_macaddr,
+ macaddr = vap ? vap->iv_myaddr : ic->ic_macaddr;
+ DPRINTF(("Setting MAC address to %6D\n", macaddr, ":"));
+ error = iwi_cmd(sc, IWI_CMD_SET_MAC_ADDRESS, macaddr,
IEEE80211_ADDR_LEN);
if (error != 0)
return error;
Modified: head/sys/dev/otus/if_otus.c
==
--- head/sys/dev/otus/if_otus.c Wed Apr 10 07:51:13 2019(r346072)
+++ head/sys/dev/otus/if_otus.c Wed Apr 10 08:17:56 2019(r346073)
@@ -3108,7 +3108,7 @@ otus_set_operating_mode(struct otus_softc *sc)
*/
IEEE80211_ADDR_COPY(bssid, zero_macaddr);
vap = TAILQ_FIRST(&ic->ic_vaps);
- macaddr = ic->ic_macaddr;
+ macaddr = vap ? vap->iv_myaddr : ic->ic_macaddr;
switch (ic->ic_opmode) {
case IEEE80211_M_STA:
Modified: head/sys/dev/usb/wlan/if_urtw.c
==
--- head/sys/dev/usb/wlan/if_urtw.c Wed Apr 10 07:51:13 2019
(r346072)
+++ head/sys/dev/usb/wlan/if_urtw.c Wed Apr 10 08:17:56 2019
(r346073)
@@ -752,6 +752,7 @@ static void urtw_free_tx_data_list(struct
urtw_softc
static voidurtw_free_rx_data_list(struct urtw_softc *);
static voidurtw_free_data_list(struct urtw_softc *,
struct urtw_data data[], int, int);
+static usb_error_t urtw_set_macaddr(struct urtw_softc *, const uint8_t *);
static usb_error_t urtw_adapter_start(struct urtw_softc *);
static usb_error_t urtw_adapter_start_b(struct urtw_softc *);
static usb_error_t urtw_set_mode(struct urtw_softc *, uint32_t);
@@ -1187,9 +1188,23 @@ fail:
}
static usb_error_t
+urtw_set_macaddr(struct urtw_softc *sc, const uint8_t *macaddr)
+{
+ usb_error_t error;
+
+ urtw_write32_m(sc, URTW_MAC0, ((const uint32_t *)macaddr)[0]);
+ urtw_write16_m(sc, URTW_MAC4, ((const uint32_t *)macaddr)[1] & 0x);
+
+fail:
+ return (error);
+}
+
+static usb_error_t
urtw_adapter_start(struct urtw_softc *sc)
{
struct ieee80211com *ic = &sc->sc_ic;
+ struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
+ const uint8_t *macaddr;
usb_error_t error;
error = urtw_reset(sc);
@@ -1209,8 +1224,11 @@ urtw_adapter_start(struct urtw_softc *sc)
if (error)
goto fail;
/* applying MAC address again. */
- urtw_write32_m(sc, URTW_MAC0, ((uint32_t *)ic->ic_macaddr)[0]);
- urtw_write16_m(sc, URTW_MAC4, ((uint32_t *)ic->ic_macaddr)[1] & 0x);
+ macaddr = vap ? vap->iv_myaddr : ic->ic_macaddr;
+ urtw_set_macaddr(sc, macaddr);
+ if (error)
+ goto fail;
+
error = urtw_set_mode(sc, URTW_EPROM_CMD_NORMAL);
if (error)
goto fail;
@@ -3180,6 +3198,8 @@ static usb_error_t
urtw_8225v2b_rf_init(struct urtw_softc *sc)
{
struct ieee80211com *ic = &sc->sc_ic;
+ struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
+ const uint8_t *macaddr;
unsigned int i;
uint8_t data8;
usb_error_t error;
@@ -3227,8 +3247,10 @@ urtw_8225v2b_rf_init(struct urtw_softc *sc)
urtw_write8_m(sc, URTW_CONFIG1, data8);
/* applying MAC address again. */
- urtw_write32_m(sc, URTW_MAC0, ((uint32_t *)ic->ic_macaddr)[0]);
- urtw_write16_m(sc, URTW_MAC4, ((uint32_t *)ic->ic_macaddr)[1] & 0x);
+ macaddr = vap ? vap->iv_myaddr : ic->ic_macaddr;
+ error = urtw_set_macaddr(sc, macaddr);
+ if (error)
+ goto fail;
error = urtw_set_mode(sc, URTW_EPROM_CMD_NORMAL);
if (error)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/m
svn commit: r303344 - stable/11/sys/dev/urtwn
Author: avos
Date: Tue Jul 26 20:26:03 2016
New Revision: 303344
URL: https://svnweb.freebsd.org/changeset/base/303344
Log:
MFC r303115:
urtwn: fix A-MSDU tx aggregation when encryption is used.
Clear unused (undocumented) CAM bytes while setting a key;
without that, hardware does weird things when A-MSDU bit in QoS header
is set.
Tested with RTL8188CUS (AP) -> RTL8188EU (STA) (A-MSDU transmit).
Reported by: many
Approved by: re (gjb)
Obtained from:https://github.com/s3erios/urtwm
Modified:
stable/11/sys/dev/urtwn/if_urtwn.c
stable/11/sys/dev/urtwn/if_urtwnreg.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/dev/urtwn/if_urtwn.c
==
--- stable/11/sys/dev/urtwn/if_urtwn.c Tue Jul 26 20:20:09 2016
(r303343)
+++ stable/11/sys/dev/urtwn/if_urtwn.c Tue Jul 26 20:26:03 2016
(r303344)
@@ -2318,6 +2318,10 @@ urtwn_key_set_cb(struct urtwn_softc *sc,
k->wk_cipher->ic_cipher, algo, k->wk_flags, k->wk_keylen,
ether_sprintf(k->wk_macaddr));
+ /* Clear high bits. */
+ urtwn_cam_write(sc, R92C_CAM_CTL6(k->wk_keyix), 0);
+ urtwn_cam_write(sc, R92C_CAM_CTL7(k->wk_keyix), 0);
+
/* Write key. */
for (i = 0; i < 4; i++) {
error = urtwn_cam_write(sc, R92C_CAM_KEY(k->wk_keyix, i),
Modified: stable/11/sys/dev/urtwn/if_urtwnreg.h
==
--- stable/11/sys/dev/urtwn/if_urtwnreg.h Tue Jul 26 20:20:09 2016
(r303343)
+++ stable/11/sys/dev/urtwn/if_urtwnreg.h Tue Jul 26 20:26:03 2016
(r303344)
@@ -871,6 +871,8 @@
#define R92C_CAM_CTL0(entry) ((entry) * 8 + 0)
#define R92C_CAM_CTL1(entry) ((entry) * 8 + 1)
#define R92C_CAM_KEY(entry, i) ((entry) * 8 + 2 + (i))
+#define R92C_CAM_CTL6(entry) ((entry) * 8 + 6)
+#define R92C_CAM_CTL7(entry) ((entry) * 8 + 7)
/* Bits for R92C_CAM_CTL0(i). */
#define R92C_CAM_KEYID_M 0x0003
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r304880 - head/sys/dev/iwm
Author: avos Date: Sat Aug 27 08:34:20 2016 New Revision: 304880 URL: https://svnweb.freebsd.org/changeset/base/304880 Log: iwm: add 'command accepted' debug notification (copied from wpi(4)). Now it should be easier to find out which command causes firmware panics when few commands are sent in a short period of time. Modified: head/sys/dev/iwm/if_iwm.c Modified: head/sys/dev/iwm/if_iwm.c == --- head/sys/dev/iwm/if_iwm.c Sat Aug 27 02:53:21 2016(r304879) +++ head/sys/dev/iwm/if_iwm.c Sat Aug 27 08:34:20 2016(r304880) @@ -3120,6 +3120,11 @@ iwm_cmd_done(struct iwm_softc *sc, struc return; /* Not a command ack. */ } + /* XXX wide commands? */ + IWM_DPRINTF(sc, IWM_DEBUG_CMD, + "cmd notification type 0x%x qid %d idx %d\n", + pkt->hdr.code, pkt->hdr.qid, pkt->hdr.idx); + data = &ring->data[pkt->hdr.idx]; /* If the command was mapped in an mbuf, free it. */ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r304891 - head/sys/dev/iwm
Author: avos
Date: Sat Aug 27 10:04:48 2016
New Revision: 304891
URL: https://svnweb.freebsd.org/changeset/base/304891
Log:
iwm: fix few comment typos.
Modified:
head/sys/dev/iwm/if_iwmreg.h
Modified: head/sys/dev/iwm/if_iwmreg.h
==
--- head/sys/dev/iwm/if_iwmreg.hSat Aug 27 10:00:36 2016
(r304890)
+++ head/sys/dev/iwm/if_iwmreg.hSat Aug 27 10:04:48 2016
(r304891)
@@ -3219,7 +3219,7 @@ enum iwm_sf_scenario {
#define IWM_SF_SINGLE_UNICAST_AGING_TIMER_DEF 400 /* 0.4 mSec */
#define IWM_SF_AGG_UNICAST_IDLE_TIMER_DEF 160 /* 150 uSec */
#define IWM_SF_AGG_UNICAST_AGING_TIMER_DEF 400 /* 0.4 mSec */
-#define IWM_SF_MCAST_IDLE_TIMER_DEF 160/* 150 mSec */
+#define IWM_SF_MCAST_IDLE_TIMER_DEF 160/* 150 uSec */
#define IWM_SF_MCAST_AGING_TIMER_DEF 400 /* 0.4 mSec */
#define IWM_SF_BA_IDLE_TIMER_DEF 160 /* 150 uSec */
#define IWM_SF_BA_AGING_TIMER_DEF 400 /* 0.4 mSec */
@@ -3244,7 +3244,7 @@ enum iwm_sf_scenario {
/**
* Smart Fifo configuration command.
- * @state: smart fifo state, types listed in iwm_sf_sate.
+ * @state: smart fifo state, types listed in iwm_sf_state.
* @watermark: Minimum allowed available free space in RXF for transient state.
* @long_delay_timeouts: aging and idle timer values for each scenario
* in long delay state.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r344115 - head
Author: avos Date: Thu Feb 14 09:21:19 2019 New Revision: 344115 URL: https://svnweb.freebsd.org/changeset/base/344115 Log: Add UPDATING entry for IEEE80211_AMPDU_AGE and AH_SUPPORT_AR5416 options removal Notified by: ian Modified: head/UPDATING Modified: head/UPDATING == --- head/UPDATING Thu Feb 14 09:12:19 2019(r344114) +++ head/UPDATING Thu Feb 14 09:21:19 2019(r344115) @@ -38,6 +38,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: modules on kernels not having 'device iflib', the iflib.ko module is loaded automatically. +20190125: + The IEEE80211_AMPDU_AGE and AH_SUPPORT_AR5416 kernel configuration + options no longer exist since r343219 and r343427 respectively; + nothing uses them, so they should be just removed from custom + kernel config files. + 20181230: r342635 changes the way efibootmgr(8) works by requiring users to add the -b (bootnum) parameter for commands where the bootnum was previously ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r344116 - stable/12/tools/build/mk
Author: avos
Date: Thu Feb 14 09:48:13 2019
New Revision: 344116
URL: https://svnweb.freebsd.org/changeset/base/344116
Log:
MFC r343868:
Correct ypldap(8) install path in OptionalObsoleteFiles.inc
It's installed to /usr/sbin, not to /usr/bin.
While here, add missing manpages and /var/yp directory to the list.
Modified:
stable/12/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/tools/build/mk/OptionalObsoleteFiles.inc
==
--- stable/12/tools/build/mk/OptionalObsoleteFiles.inc Thu Feb 14 09:21:19
2019(r344115)
+++ stable/12/tools/build/mk/OptionalObsoleteFiles.inc Thu Feb 14 09:48:13
2019(r344116)
@@ -6485,7 +6485,6 @@ OLD_FILES+=usr/bin/ypcat
OLD_FILES+=usr/bin/ypchfn
OLD_FILES+=usr/bin/ypchpass
OLD_FILES+=usr/bin/ypchsh
-OLD_FILES+=usr/bin/ypldap
OLD_FILES+=usr/bin/ypmatch
OLD_FILES+=usr/bin/yppasswd
OLD_FILES+=usr/bin/ypwhich
@@ -6509,6 +6508,7 @@ OLD_FILES+=usr/sbin/rpc.ypxfrd
OLD_FILES+=usr/sbin/yp_mkdb
OLD_FILES+=usr/sbin/ypbind
OLD_FILES+=usr/sbin/ypinit
+OLD_FILES+=usr/sbin/ypldap
OLD_FILES+=usr/sbin/yppoll
OLD_FILES+=usr/sbin/yppush
OLD_FILES+=usr/sbin/ypserv
@@ -6521,6 +6521,7 @@ OLD_FILES+=usr/share/man/man1/ypmatch.1.gz
OLD_FILES+=usr/share/man/man1/yppasswd.1.gz
OLD_FILES+=usr/share/man/man1/ypwhich.1.gz
OLD_FILES+=usr/share/man/man5/netid.5.gz
+OLD_FILES+=usr/share/man/man5/ypldap.conf.5.gz
OLD_FILES+=usr/share/man/man8/mknetid.8.gz
OLD_FILES+=usr/share/man/man8/rpc.yppasswdd.8.gz
OLD_FILES+=usr/share/man/man8/rpc.ypxfrd.8.gz
@@ -6531,6 +6532,7 @@ OLD_FILES+=usr/share/man/man8/nis.8.gz
OLD_FILES+=usr/share/man/man8/yp_mkdb.8.gz
OLD_FILES+=usr/share/man/man8/ypbind.8.gz
OLD_FILES+=usr/share/man/man8/ypinit.8.gz
+OLD_FILES+=usr/share/man/man8/ypldap.8.gz
OLD_FILES+=usr/share/man/man8/yppoll.8.gz
OLD_FILES+=usr/share/man/man8/yppush.8.gz
OLD_FILES+=usr/share/man/man8/ypserv.8.gz
@@ -6538,6 +6540,7 @@ OLD_FILES+=usr/share/man/man8/ypset.8.gz
OLD_FILES+=usr/share/man/man8/ypxfr.8.gz
OLD_FILES+=var/yp/Makefile
OLD_FILES+=var/yp/Makefile.dist
+OLD_DIRS+=var/yp
.endif
.if ${MK_NLS} == no
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r344117 - stable/11/tools/build/mk
Author: avos
Date: Thu Feb 14 09:50:59 2019
New Revision: 344117
URL: https://svnweb.freebsd.org/changeset/base/344117
Log:
MFC r343868:
Add ypldap(8)-related files and /var/yp directory to the
OptionalObsoleteFiles.inc.
Modified:
stable/11/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/tools/build/mk/OptionalObsoleteFiles.inc
==
--- stable/11/tools/build/mk/OptionalObsoleteFiles.inc Thu Feb 14 09:48:13
2019(r344116)
+++ stable/11/tools/build/mk/OptionalObsoleteFiles.inc Thu Feb 14 09:50:59
2019(r344117)
@@ -6537,6 +6537,7 @@ OLD_FILES+=usr/sbin/rpc.ypxfrd
OLD_FILES+=usr/sbin/yp_mkdb
OLD_FILES+=usr/sbin/ypbind
OLD_FILES+=usr/sbin/ypinit
+OLD_FILES+=usr/sbin/ypldap
OLD_FILES+=usr/sbin/yppoll
OLD_FILES+=usr/sbin/yppush
OLD_FILES+=usr/sbin/ypserv
@@ -6549,6 +6550,7 @@ OLD_FILES+=usr/share/man/man1/ypmatch.1.gz
OLD_FILES+=usr/share/man/man1/yppasswd.1.gz
OLD_FILES+=usr/share/man/man1/ypwhich.1.gz
OLD_FILES+=usr/share/man/man5/netid.5.gz
+OLD_FILES+=usr/share/man/man5/ypldap.conf.5.gz
OLD_FILES+=usr/share/man/man8/mknetid.8.gz
OLD_FILES+=usr/share/man/man8/rpc.yppasswdd.8.gz
OLD_FILES+=usr/share/man/man8/rpc.ypxfrd.8.gz
@@ -6559,6 +6561,7 @@ OLD_FILES+=usr/share/man/man8/nis.8.gz
OLD_FILES+=usr/share/man/man8/yp_mkdb.8.gz
OLD_FILES+=usr/share/man/man8/ypbind.8.gz
OLD_FILES+=usr/share/man/man8/ypinit.8.gz
+OLD_FILES+=usr/share/man/man8/ypldap.8.gz
OLD_FILES+=usr/share/man/man8/yppoll.8.gz
OLD_FILES+=usr/share/man/man8/yppush.8.gz
OLD_FILES+=usr/share/man/man8/ypserv.8.gz
@@ -6566,6 +6569,7 @@ OLD_FILES+=usr/share/man/man8/ypset.8.gz
OLD_FILES+=usr/share/man/man8/ypxfr.8.gz
OLD_FILES+=var/yp/Makefile
OLD_FILES+=var/yp/Makefile.dist
+OLD_DIRS+=var/yp
.endif
.if ${MK_NLS} == no
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r344193 - in stable: 10/usr.bin/newkey 11/usr.bin/newkey 12/usr.bin/newkey
Author: avos
Date: Sat Feb 16 00:37:08 2019
New Revision: 344193
URL: https://svnweb.freebsd.org/changeset/base/344193
Log:
MFC r343909:
newkey(8): fix 'tmpname' memory leak (always) and input file descriptor leak
when output file cannot be opened
PR: 201732
Reported by: David Binderman
Modified:
stable/11/usr.bin/newkey/update.c
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/usr.bin/newkey/update.c
stable/12/usr.bin/newkey/update.c
Directory Properties:
stable/10/ (props changed)
stable/12/ (props changed)
Modified: stable/11/usr.bin/newkey/update.c
==
--- stable/11/usr.bin/newkey/update.c Sat Feb 16 00:15:54 2019
(r344192)
+++ stable/11/usr.bin/newkey/update.c Sat Feb 16 00:37:08 2019
(r344193)
@@ -266,11 +266,14 @@ localupdate(char *name, char *filename, u_int op, u_in
sprintf(tmpname, "%s.tmp", filename);
rf = fopen(filename, "r");
if (rf == NULL) {
- return (ERR_READ);
+ err = ERR_READ;
+ goto cleanup;
}
wf = fopen(tmpname, "w");
if (wf == NULL) {
- return (ERR_WRITE);
+ fclose(rf);
+ err = ERR_WRITE;
+ goto cleanup;
}
err = -1;
while (fgets(line, sizeof (line), rf)) {
@@ -310,13 +313,18 @@ localupdate(char *name, char *filename, u_int op, u_in
fclose(rf);
if (err == 0) {
if (rename(tmpname, filename) < 0) {
- return (ERR_DBASE);
+ err = ERR_DBASE;
+ goto cleanup;
}
} else {
if (unlink(tmpname) < 0) {
- return (ERR_DBASE);
+ err = ERR_DBASE;
+ goto cleanup;
}
}
+
+cleanup:
+ free(tmpname);
return (err);
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r344193 - in stable: 10/usr.bin/newkey 11/usr.bin/newkey 12/usr.bin/newkey
Author: avos
Date: Sat Feb 16 00:37:08 2019
New Revision: 344193
URL: https://svnweb.freebsd.org/changeset/base/344193
Log:
MFC r343909:
newkey(8): fix 'tmpname' memory leak (always) and input file descriptor leak
when output file cannot be opened
PR: 201732
Reported by: David Binderman
Modified:
stable/10/usr.bin/newkey/update.c
Directory Properties:
stable/10/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/usr.bin/newkey/update.c
stable/12/usr.bin/newkey/update.c
Directory Properties:
stable/11/ (props changed)
stable/12/ (props changed)
Modified: stable/10/usr.bin/newkey/update.c
==
--- stable/10/usr.bin/newkey/update.c Sat Feb 16 00:15:54 2019
(r344192)
+++ stable/10/usr.bin/newkey/update.c Sat Feb 16 00:37:08 2019
(r344193)
@@ -266,11 +266,14 @@ localupdate(char *name, char *filename, u_int op, u_in
sprintf(tmpname, "%s.tmp", filename);
rf = fopen(filename, "r");
if (rf == NULL) {
- return (ERR_READ);
+ err = ERR_READ;
+ goto cleanup;
}
wf = fopen(tmpname, "w");
if (wf == NULL) {
- return (ERR_WRITE);
+ fclose(rf);
+ err = ERR_WRITE;
+ goto cleanup;
}
err = -1;
while (fgets(line, sizeof (line), rf)) {
@@ -310,13 +313,18 @@ localupdate(char *name, char *filename, u_int op, u_in
fclose(rf);
if (err == 0) {
if (rename(tmpname, filename) < 0) {
- return (ERR_DBASE);
+ err = ERR_DBASE;
+ goto cleanup;
}
} else {
if (unlink(tmpname) < 0) {
- return (ERR_DBASE);
+ err = ERR_DBASE;
+ goto cleanup;
}
}
+
+cleanup:
+ free(tmpname);
return (err);
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r344193 - in stable: 10/usr.bin/newkey 11/usr.bin/newkey 12/usr.bin/newkey
Author: avos
Date: Sat Feb 16 00:37:08 2019
New Revision: 344193
URL: https://svnweb.freebsd.org/changeset/base/344193
Log:
MFC r343909:
newkey(8): fix 'tmpname' memory leak (always) and input file descriptor leak
when output file cannot be opened
PR: 201732
Reported by: David Binderman
Modified:
stable/12/usr.bin/newkey/update.c
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/usr.bin/newkey/update.c
stable/11/usr.bin/newkey/update.c
Directory Properties:
stable/10/ (props changed)
stable/11/ (props changed)
Modified: stable/12/usr.bin/newkey/update.c
==
--- stable/12/usr.bin/newkey/update.c Sat Feb 16 00:15:54 2019
(r344192)
+++ stable/12/usr.bin/newkey/update.c Sat Feb 16 00:37:08 2019
(r344193)
@@ -266,11 +266,14 @@ localupdate(char *name, char *filename, u_int op, u_in
sprintf(tmpname, "%s.tmp", filename);
rf = fopen(filename, "r");
if (rf == NULL) {
- return (ERR_READ);
+ err = ERR_READ;
+ goto cleanup;
}
wf = fopen(tmpname, "w");
if (wf == NULL) {
- return (ERR_WRITE);
+ fclose(rf);
+ err = ERR_WRITE;
+ goto cleanup;
}
err = -1;
while (fgets(line, sizeof (line), rf)) {
@@ -310,13 +313,18 @@ localupdate(char *name, char *filename, u_int op, u_in
fclose(rf);
if (err == 0) {
if (rename(tmpname, filename) < 0) {
- return (ERR_DBASE);
+ err = ERR_DBASE;
+ goto cleanup;
}
} else {
if (unlink(tmpname) < 0) {
- return (ERR_DBASE);
+ err = ERR_DBASE;
+ goto cleanup;
}
}
+
+cleanup:
+ free(tmpname);
return (err);
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r344196 - in stable: 10/sbin/ifconfig 11/sbin/ifconfig 12/sbin/ifconfig
Author: avos
Date: Sat Feb 16 01:05:22 2019
New Revision: 344196
URL: https://svnweb.freebsd.org/changeset/base/344196
Log:
MFC r343980:
ifconfig(8): display 802.11n rates correctly for 'roam:rate' parameter
Modified:
stable/12/sbin/ifconfig/ifieee80211.c
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/sbin/ifconfig/ifieee80211.c
stable/11/sbin/ifconfig/ifieee80211.c
Directory Properties:
stable/10/ (props changed)
stable/11/ (props changed)
Modified: stable/12/sbin/ifconfig/ifieee80211.c
==
--- stable/12/sbin/ifconfig/ifieee80211.c Sat Feb 16 00:40:03 2019
(r344195)
+++ stable/12/sbin/ifconfig/ifieee80211.c Sat Feb 16 01:05:22 2019
(r344196)
@@ -5080,7 +5080,9 @@ end:
LINE_CHECK("roam:rssi %u.5", rp->rssi/2);
else
LINE_CHECK("roam:rssi %u", rp->rssi/2);
- LINE_CHECK("roam:rate %u", rp->rate/2);
+ LINE_CHECK("roam:rate %s%u",
+ (rp->rate & IEEE80211_RATE_MCS) ? "MCS " : "",
+ get_rate_value(rp->rate));
} else {
LINE_BREAK();
list_roam(s);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r344196 - in stable: 10/sbin/ifconfig 11/sbin/ifconfig 12/sbin/ifconfig
Author: avos
Date: Sat Feb 16 01:05:22 2019
New Revision: 344196
URL: https://svnweb.freebsd.org/changeset/base/344196
Log:
MFC r343980:
ifconfig(8): display 802.11n rates correctly for 'roam:rate' parameter
Modified:
stable/11/sbin/ifconfig/ifieee80211.c
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/sbin/ifconfig/ifieee80211.c
stable/12/sbin/ifconfig/ifieee80211.c
Directory Properties:
stable/10/ (props changed)
stable/12/ (props changed)
Modified: stable/11/sbin/ifconfig/ifieee80211.c
==
--- stable/11/sbin/ifconfig/ifieee80211.c Sat Feb 16 00:40:03 2019
(r344195)
+++ stable/11/sbin/ifconfig/ifieee80211.c Sat Feb 16 01:05:22 2019
(r344196)
@@ -4699,7 +4699,9 @@ end:
LINE_CHECK("roam:rssi %u.5", rp->rssi/2);
else
LINE_CHECK("roam:rssi %u", rp->rssi/2);
- LINE_CHECK("roam:rate %u", rp->rate/2);
+ LINE_CHECK("roam:rate %s%u",
+ (rp->rate & IEEE80211_RATE_MCS) ? "MCS " : "",
+ get_rate_value(rp->rate));
} else {
LINE_BREAK();
list_roam(s);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r344196 - in stable: 10/sbin/ifconfig 11/sbin/ifconfig 12/sbin/ifconfig
Author: avos
Date: Sat Feb 16 01:05:22 2019
New Revision: 344196
URL: https://svnweb.freebsd.org/changeset/base/344196
Log:
MFC r343980:
ifconfig(8): display 802.11n rates correctly for 'roam:rate' parameter
Modified:
stable/10/sbin/ifconfig/ifieee80211.c
Directory Properties:
stable/10/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/sbin/ifconfig/ifieee80211.c
stable/12/sbin/ifconfig/ifieee80211.c
Directory Properties:
stable/11/ (props changed)
stable/12/ (props changed)
Modified: stable/10/sbin/ifconfig/ifieee80211.c
==
--- stable/10/sbin/ifconfig/ifieee80211.c Sat Feb 16 00:40:03 2019
(r344195)
+++ stable/10/sbin/ifconfig/ifieee80211.c Sat Feb 16 01:05:22 2019
(r344196)
@@ -4557,7 +4557,9 @@ end:
LINE_CHECK("roam:rssi %u.5", rp->rssi/2);
else
LINE_CHECK("roam:rssi %u", rp->rssi/2);
- LINE_CHECK("roam:rate %u", rp->rate/2);
+ LINE_CHECK("roam:rate %s%u",
+ (rp->rate & IEEE80211_RATE_MCS) ? "MCS " : "",
+ get_rate_value(rp->rate));
} else {
LINE_BREAK();
list_roam(s);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r344197 - stable/12/sys/dev/iwn
Author: avos
Date: Sat Feb 16 01:19:14 2019
New Revision: 344197
URL: https://svnweb.freebsd.org/changeset/base/344197
Log:
MFC r343094:
iwn(4): (partially) rewrite A-MPDU Tx path
The change fixes ifnet counters and improves Tx stability when A-MPDU
is used.
MFC r343292:
iwn(4): drop i_seq field initialization for A-MPDU frames
It is done by net80211 since r319460.
PR: 192641, 210211
Reviewed by: adrian, dhw
Differential Revision:https://reviews.freebsd.org/D10728
Modified:
stable/12/sys/dev/iwn/if_iwn.c
stable/12/sys/dev/iwn/if_iwn_debug.h
stable/12/sys/dev/iwn/if_iwnreg.h
stable/12/sys/dev/iwn/if_iwnvar.h
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/dev/iwn/if_iwn.c
==
--- stable/12/sys/dev/iwn/if_iwn.c Sat Feb 16 01:05:22 2019
(r344196)
+++ stable/12/sys/dev/iwn/if_iwn.c Sat Feb 16 01:19:14 2019
(r344197)
@@ -168,6 +168,7 @@ static int iwn_alloc_tx_ring(struct iwn_softc *, struc
int);
static voidiwn_reset_tx_ring(struct iwn_softc *, struct iwn_tx_ring *);
static voidiwn_free_tx_ring(struct iwn_softc *, struct iwn_tx_ring *);
+static voidiwn_check_tx_ring(struct iwn_softc *, int);
static voidiwn5000_ict_reset(struct iwn_softc *);
static int iwn_read_eeprom(struct iwn_softc *,
uint8_t macaddr[IEEE80211_ADDR_LEN]);
@@ -199,6 +200,8 @@ static void iwn_calib_timeout(void *);
static voidiwn_rx_phy(struct iwn_softc *, struct iwn_rx_desc *);
static voidiwn_rx_done(struct iwn_softc *, struct iwn_rx_desc *,
struct iwn_rx_data *);
+static voidiwn_agg_tx_complete(struct iwn_softc *, struct iwn_tx_ring *,
+ int, int, int);
static voidiwn_rx_compressed_ba(struct iwn_softc *, struct iwn_rx_desc *);
static voidiwn5000_rx_calib_results(struct iwn_softc *,
struct iwn_rx_desc *);
@@ -207,10 +210,13 @@ static void iwn4965_tx_done(struct iwn_softc *,
struct
struct iwn_rx_data *);
static voidiwn5000_tx_done(struct iwn_softc *, struct iwn_rx_desc *,
struct iwn_rx_data *);
+static voidiwn_adj_ampdu_ptr(struct iwn_softc *, struct iwn_tx_ring *);
static voidiwn_tx_done(struct iwn_softc *, struct iwn_rx_desc *, int, int,
uint8_t);
-static voidiwn_ampdu_tx_done(struct iwn_softc *, int, int, int, int, int,
- void *);
+static int iwn_ampdu_check_bitmap(uint64_t, int, int);
+static int iwn_ampdu_index_check(struct iwn_softc *, struct iwn_tx_ring *,
+ uint64_t, int, int);
+static voidiwn_ampdu_tx_done(struct iwn_softc *, int, int, int, void *);
static voidiwn_cmd_done(struct iwn_softc *, struct iwn_rx_desc *);
static voidiwn_notif_intr(struct iwn_softc *);
static voidiwn_wakeup_intr(struct iwn_softc *);
@@ -2069,6 +2075,8 @@ iwn_reset_tx_ring(struct iwn_softc *sc, struct iwn_tx_
ieee80211_free_node(data->ni);
data->ni = NULL;
}
+ data->remapped = 0;
+ data->long_retries = 0;
}
/* Clear TX descriptors. */
memset(ring->desc, 0, ring->desc_dma.size);
@@ -2108,6 +2116,42 @@ iwn_free_tx_ring(struct iwn_softc *sc, struct iwn_tx_r
}
static void
+iwn_check_tx_ring(struct iwn_softc *sc, int qid)
+{
+ struct iwn_tx_ring *ring = &sc->txq[qid];
+
+ KASSERT(ring->queued >= 0, ("%s: ring->queued (%d) for queue %d < 0!",
+ __func__, ring->queued, qid));
+
+ if (qid >= sc->firstaggqueue) {
+ struct iwn_ops *ops = &sc->ops;
+ struct ieee80211_tx_ampdu *tap = sc->qid2tap[qid];
+
+ if (ring->queued == 0 && !IEEE80211_AMPDU_RUNNING(tap)) {
+ uint16_t ssn = tap->txa_start & 0xfff;
+ uint8_t tid = tap->txa_tid;
+ int *res = tap->txa_private;
+
+ iwn_nic_lock(sc);
+ ops->ampdu_tx_stop(sc, qid, tid, ssn);
+ iwn_nic_unlock(sc);
+
+ sc->qid2tap[qid] = NULL;
+ free(res, M_DEVBUF);
+ }
+ }
+
+ if (ring->queued < IWN_TX_RING_LOMARK) {
+ sc->qfullmsk &= ~(1 << qid);
+
+ if (ring->queued == 0)
+ sc->sc_tx_timer = 0;
+ else
+ sc->sc_tx_timer = 5;
+ }
+}
+
+static void
iwn5000_ict_reset(struct iwn_softc *sc)
{
/* Disable interrupts. */
@@ -3163,104 +3207,129 @@ iwn_rx_done(struct iwn_softc *sc, struct iwn_rx_desc *
}
-/* Process an incoming Compressed BlockAck. */
static void
-iwn_rx_compressed_ba(struct iwn_softc *sc, struct iwn_rx_desc *desc)
+iwn_agg_tx_complete(struct iwn_softc *sc, struct i
svn commit: r344198 - in head/sys: conf dev/ata
Author: avos
Date: Sat Feb 16 01:48:38 2019
New Revision: 344198
URL: https://svnweb.freebsd.org/changeset/base/344198
Log:
GC ATA_REQUEST_TIMEOUT option remnants
It was removed from code in r249083 and from sys/conf/options in r249213.
PR: 222170
MFC after:3 days
Modified:
head/sys/conf/NOTES
head/sys/dev/ata/ata-all.h
Modified: head/sys/conf/NOTES
==
--- head/sys/conf/NOTES Sat Feb 16 01:19:14 2019(r344197)
+++ head/sys/conf/NOTES Sat Feb 16 01:48:38 2019(r344198)
@@ -1760,14 +1760,6 @@ hint.ata.1.port="0x170"
hint.ata.1.irq="15"
#
-# The following options are valid on the ATA driver:
-#
-# ATA_REQUEST_TIMEOUT: the number of seconds to wait for an ATA request
-# before timing out.
-
-#options ATA_REQUEST_TIMEOUT=10
-
-#
# Standard floppy disk controllers and floppy tapes, supports
# the Y-E DATA External FDD (PC Card)
#
Modified: head/sys/dev/ata/ata-all.h
==
--- head/sys/dev/ata/ata-all.h Sat Feb 16 01:19:14 2019(r344197)
+++ head/sys/dev/ata/ata-all.h Sat Feb 16 01:48:38 2019(r344198)
@@ -203,10 +203,6 @@
#define ATA_OP_FINISHED 1
#define ATA_MAX_28BIT_LBA 268435455UL
-#ifndefATA_REQUEST_TIMEOUT
-#defineATA_REQUEST_TIMEOUT 10
-#endif
-
/* structure used for composite atomic operations */
#define MAX_COMPOSITES 32 /* u_int32_t bits */
struct ata_composite {
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r344201 - head/tools/build/mk
Author: avos
Date: Sat Feb 16 03:49:48 2019
New Revision: 344201
URL: https://svnweb.freebsd.org/changeset/base/344201
Log:
Remove vi(1)-related files via 'make delete-old' when WITHOUT_VI=1 is set.
MFC after:5 days
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Sat Feb 16 03:18:52
2019(r344200)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Sat Feb 16 03:49:48
2019(r344201)
@@ -9704,6 +9704,32 @@ OLD_FILES+=usr/share/man/man8/lastlogin.8.gz
OLD_FILES+=usr/share/man/man8/utx.8.gz
.endif
+.if ${MK_VI} == no
+OLD_FILES+=etc/rc.d/virecover
+OLD_FILES+=rescue/ex
+OLD_FILES+=rescue/vi
+OLD_FILES+=usr/bin/ex
+OLD_FILES+=usr/bin/nex
+OLD_FILES+=usr/bin/nvi
+OLD_FILES+=usr/bin/nview
+OLD_FILES+=usr/bin/vi
+OLD_FILES+=usr/bin/view
+OLD_FILES+=usr/share/man/man1/ex.1.gz
+OLD_FILES+=usr/share/man/man1/nex.1.gz
+OLD_FILES+=usr/share/man/man1/nvi.1.gz
+OLD_FILES+=usr/share/man/man1/nview.1.gz
+OLD_FILES+=usr/share/man/man1/vi.1.gz
+OLD_FILES+=usr/share/man/man1/view.1.gz
+. if exists(${DESTDIR}/usr/share/vi)
+VI_DIRS!=find ${DESTDIR}/usr/share/vi -type d \
+| sed -e 's,^${DESTDIR}/,,'; echo
+VI_FILES!=find ${DESTDIR}/usr/share/vi \! -type d \
+| sed -e 's,^${DESTDIR}/,,'; echo
+OLD_DIRS+=${VI_DIRS}
+OLD_FILES+=${VI_FILES}
+. endif
+.endif
+
.if ${MK_WIRELESS} == no
OLD_FILES+=etc/regdomain.xml
OLD_FILES+=etc/rc.d/hostapd
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r344207 - head/tools/build/mk
Author: avos
Date: Sat Feb 16 04:49:51 2019
New Revision: 344207
URL: https://svnweb.freebsd.org/changeset/base/344207
Log:
Allow to remove unused files via 'make delete-old(-libs)' when WITHOUT_OFED
and / or WITHOUT_OFED_EXTRA src.conf(5) options are set.
MFC after:5 days
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Sat Feb 16 04:49:10
2019(r344206)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Sat Feb 16 04:49:51
2019(r344207)
@@ -7172,6 +7172,383 @@ OLD_FILES+=usr/share/man/man8/ntpq.8.gz
OLD_FILES+=usr/share/man/man8/ntptime.8.gz
.endif
+.if ${MK_OFED} == no
+OLD_FILES+=etc/newsyslog.conf.d/opensm.conf
+OLD_FILES+=etc/rc.d/opensm
+OLD_FILES+=usr/bin/ibstat
+OLD_FILES+=usr/bin/ibv_asyncwatch
+OLD_FILES+=usr/bin/ibv_devices
+OLD_FILES+=usr/bin/ibv_devinfo
+OLD_FILES+=usr/bin/ibv_rc_pingpong
+OLD_FILES+=usr/bin/ibv_srq_pingpong
+OLD_FILES+=usr/bin/ibv_uc_pingpong
+OLD_FILES+=usr/bin/ibv_ud_pingpong
+OLD_FILES+=usr/bin/mckey
+OLD_FILES+=usr/bin/rping
+OLD_FILES+=usr/bin/ucmatose
+OLD_FILES+=usr/bin/udaddy
+OLD_FILES+=usr/include/infiniband/marshall.h
+OLD_FILES+=usr/include/infiniband/kern-abi.h
+OLD_FILES+=usr/include/infiniband/umad_sm.h
+OLD_FILES+=usr/include/infiniband/umad.h
+OLD_FILES+=usr/include/infiniband/arch.h
+OLD_FILES+=usr/include/infiniband/verbs.h
+OLD_FILES+=usr/include/infiniband/ib.h
+OLD_FILES+=usr/include/infiniband/cm.h
+OLD_FILES+=usr/include/infiniband/opcode.h
+OLD_FILES+=usr/include/infiniband/ibnetdisc.h
+OLD_FILES+=usr/include/infiniband/driver.h
+OLD_FILES+=usr/include/infiniband/mad_osd.h
+OLD_FILES+=usr/include/infiniband/umad_types.h
+OLD_FILES+=usr/include/infiniband/umad_cm.h
+OLD_FILES+=usr/include/infiniband/cm_abi.h
+OLD_FILES+=usr/include/infiniband/sa-kern-abi.h
+OLD_FILES+=usr/include/infiniband/ibnetdisc_osd.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_event_plugin.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_console_io.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_ucast_cache.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_port.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_path.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_mtree.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_log.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_mcm_port.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_subnet.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_pkey.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_remote_sm.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_qos_policy.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_sm.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_node.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_mcast_mgr.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_madw.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_lid_mgr.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_congestion_control.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_port_profile.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_perfmgr.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_service.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_base.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_vl15intf.h
+OLD_FILES+=usr/include/infiniband/opensm/st.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_attrib_req.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_ucast_mgr.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_db.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_sa_mad_ctrl.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_db_pack.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_opensm.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_mesh.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_mcast_tbl.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_sm_mad_ctrl.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_stats.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_mad_pool.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_switch.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_ucast_lash.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_errors.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_partition.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_prefix_route.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_helper.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_version.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_sa.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_config.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_multicast.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_file_ids.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_perfmgr_db.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_console.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_msgdef.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_router.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_guid.h
+OLD_FILES+=usr/include/infiniband/opensm/osm_inform.h
+OLD_DIRS+=usr/include/infiniband/opensm
+OLD_FIL
svn commit: r344208 - head/tools/build/mk
Author: avos
Date: Sat Feb 16 05:04:01 2019
New Revision: 344208
URL: https://svnweb.freebsd.org/changeset/base/344208
Log:
Add more rc.d scripts / empty directors / config files into
OptionalObsoleteFiles.inc
Note: only files with conditional installation logic were
included from the PR.
PR: 233046
Submitted by:
MFC after:5 days
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Sat Feb 16 04:49:51
2019(r344207)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Sat Feb 16 05:04:01
2019(r344208)
@@ -54,6 +54,10 @@ OLD_FILES+=usr/share/man/man8/acpidump.8.gz
OLD_FILES+=usr/share/man/man8/iasl.8.gz
.endif
+.if ${MK_ACPI} == no && ${MK_APM} == no
+OLD_FILES+=etc/rc.d/powerd
+.endif
+
.if ${MK_AMD} == no
OLD_FILES+=etc/amd.map
OLD_FILES+=etc/newsyslog.conf.d/amd.conf
@@ -434,6 +438,7 @@ OLD_FILES+=usr/bin/ld.bfd
.endif
.if ${MK_BLACKLIST} == no
+OLD_FILES+=etc/blacklistd.conf
OLD_FILES+=etc/rc.d/blacklistd
OLD_FILES+=usr/include/blacklist.h
OLD_FILES+=usr/lib/libblacklist.a
@@ -655,6 +660,7 @@ OLD_FILES+=usr/share/man/man8/zfsloader.8.gz
.endif
.if ${MK_BOOTPARAMD} == no
+OLD_FILES+=etc/rc.d/bootparams
OLD_FILES+=usr/sbin/bootparamd
OLD_FILES+=usr/share/man/man5/bootparams.5.gz
OLD_FILES+=usr/share/man/man8/bootparamd.8.gz
@@ -1131,6 +1137,7 @@ OLD_FILES+=etc/casper/system.grp
OLD_FILES+=etc/casper/system.pwd
OLD_FILES+=etc/casper/system.random
OLD_FILES+=etc/casper/system.sysctl
+OLD_DIRS+=etc/casper
OLD_FILES+=etc/rc.d/casperd
OLD_LIBS+=lib/libcapsicum.so.0
OLD_LIBS+=lib/libcasper.so.0
@@ -1293,6 +1300,8 @@ OLD_FILES+=etc/rc.d/zvol
OLD_FILES+=etc/devd/zfs.conf
OLD_FILES+=etc/periodic/daily/404.status-zfs
OLD_FILES+=etc/periodic/daily/800.scrub-zfs
+OLD_FILES+=etc/zfs/exports
+OLD_DIRS+=etc/zfs
OLD_LIBS+=lib/libzfs.so.2
OLD_LIBS+=lib/libzfs.so.3
OLD_LIBS+=lib/libzfs_core.so.2
@@ -2279,6 +2288,7 @@ OLD_DIRS+=usr/share/dict
.if ${MK_DMAGENT} == no
OLD_FILES+=etc/dma/dma.conf
+OLD_DIRS+=etc/dma
OLD_FILES+=usr/libexec/dma
OLD_FILES+=usr/libexec/dma-mbox-create
OLD_FILES+=usr/share/man/man8/dma.8.gz
@@ -2914,6 +2924,7 @@ OLD_FILES+=usr/share/man/man8/gssd.8.gz
.endif
.if ${MK_HAST} == no
+OLD_FILES+=etc/rc.d/hastd
OLD_FILES+=sbin/hastctl
OLD_FILES+=sbin/hastd
OLD_FILES+=usr/share/examples/hast/ucarp.sh
@@ -3106,6 +3117,7 @@ OLD_FILES+=rescue/rtsol
.endif
.if ${MK_INETD} == no
+OLD_FILES+=etc/inetd.conf
OLD_FILES+=etc/rc.d/inetd
OLD_FILES+=usr/sbin/inetd
OLD_FILES+=usr/share/man/man5/inetd.conf.5.gz
@@ -3196,6 +3208,7 @@ OLD_FILES+=usr/share/man/man8/ippool.8.gz
.endif
.if ${MK_IPFW} == no
+OLD_FILES+=etc/rc.d/ipfw
OLD_FILES+=etc/periodic/security/500.ipfwdenied
OLD_FILES+=etc/periodic/security/550.ipfwlimit
OLD_FILES+=sbin/ipfw
@@ -4256,6 +4269,8 @@ OLD_FILES+=usr/share/man/man1/host.1.gz
.endif
.if ${MK_LEGACY_CONSOLE} == no
+OLD_FILES+=etc/rc.d/moused
+OLD_FILES+=etc/rc.d/syscons
OLD_FILES+=usr/sbin/kbdcontrol
OLD_FILES+=usr/sbin/kbdmap
OLD_FILES+=usr/sbin/moused
@@ -6029,6 +6044,7 @@ OLD_FILES+=etc/mail.rc
OLD_FILES+=etc/mail/aliases
OLD_FILES+=etc/mail/mailer.conf
OLD_FILES+=etc/periodic/daily/130.clean-msgs
+OLD_FILES+=etc/rc.d/othermta
OLD_FILES+=usr/bin/Mail
OLD_FILES+=usr/bin/biff
OLD_FILES+=usr/bin/from
@@ -6501,6 +6517,10 @@ OLD_FILES+=usr/share/man/man8/nghook.8.gz
OLD_FILES+=usr/share/man/man8/pppoed.8.gz
.endif
+.if ${MK_IPFW} == no || ${MK_NETGRAPH} == no
+OLD_FILES+=etc/rc.d/ipfw_netflow
+.endif
+
.if ${MK_NETGRAPH_SUPPORT} == no
OLD_FILES+=usr/include/bsnmp/snmp_netgraph.h
OLD_FILES+=usr/lib/snmp_netgraph.so
@@ -6874,8 +6894,12 @@ OLD_FILES+=usr/share/man/man8/nscd.8.gz
.endif
.if ${MK_NTP} == no
+OLD_FILES+=etc/ntp/leap-seconds
+OLD_DIRS+=etc/ntp
OLD_FILES+=etc/ntp.conf
OLD_FILES+=etc/periodic/daily/480.status-ntpd
+OLD_FILES+=etc/periodic/daily/480.leapfile-ntpd
+OLD_FILES+=etc/rc.d/ntpd
OLD_FILES+=usr/bin/ntpq
OLD_FILES+=usr/sbin/ntp-keygen
OLD_FILES+=usr/sbin/ntpd
@@ -7554,6 +7578,7 @@ OLD_FILES+=etc/rc.d/sshd
OLD_FILES+=etc/ssh/moduli
OLD_FILES+=etc/ssh/ssh_config
OLD_FILES+=etc/ssh/sshd_config
+OLD_DIRS+=etc/ssh
OLD_FILES+=usr/bin/scp
OLD_FILES+=usr/bin/sftp
OLD_FILES+=usr/bin/slogin
@@ -8090,6 +8115,7 @@ OLD_FILES+=${RESCUE_FILES}
.endif
.if ${MK_ROUTED} == no
+OLD_FILES+=etc/rc.d/routed
OLD_FILES+=rescue/routed
OLD_FILES+=rescue/rtquery
OLD_FILES+=sbin/routed
@@ -8105,6 +8131,7 @@ OLD_FILES+=etc/periodic/daily/150.clean-hoststat
OLD_FILES+=etc/periodic/daily/440.status-mailq
OLD_FILES+=etc/periodic/daily/460.status-mail-rejects
OLD_FILES+=etc/periodic/daily/500.queuerun
+OLD_FILES+=etc/rc.d/sendmail
OLD_FILES+=bin/rmail
OLD_FILES+=usr/bin/vacation
OLD_FILES+=usr/include/libmilter/mfapi.h
@@ -10067,6 +10094,7 @@ OLD_FILES+=usr/sh
svn commit: r344214 - head/tools/build/mk
Author: avos
Date: Sat Feb 16 16:01:23 2019
New Revision: 344214
URL: https://svnweb.freebsd.org/changeset/base/344214
Log:
Refresh OptionalObsoleteFiles.inc for MK_PMC:
- Add missing /usr/sbin/pmc, pmcformat.h, libpmcstat.h and pmc.haswellxeon.3
to the list.
- Correct man page section for pmcstudy.8.
- Include recently added libipt and libopencsd for corresponding TARGET_ARCH
MFC after:5 days
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Sat Feb 16 15:57:29
2019(r344213)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Sat Feb 16 16:01:23
2019(r344214)
@@ -7763,8 +7763,76 @@ OLD_FILES+=usr/share/man/man7/pkg.7.gz
.if ${MK_PMC} == no
OLD_FILES+=usr/bin/pmcstudy
+.if ${TARGET_ARCH} == "amd64"
+OLD_FILES+=usr/include/libipt/pt_last_ip.h
+OLD_FILES+=usr/include/libipt/intel-pt.h
+OLD_FILES+=usr/include/libipt/pt_time.h
+OLD_FILES+=usr/include/libipt/pt_cpu.h
+OLD_FILES+=usr/include/libipt/pt_compiler.h
+OLD_DIRS+=usr/include/libipt
+.endif
+.if ${TARGET_ARCH} == "aarch64"
+OLD_FILES+=usr/include/opencsd/c_api/opencsd_c_api.h
+OLD_FILES+=usr/include/opencsd/c_api/ocsd_c_api_cust_impl.h
+OLD_FILES+=usr/include/opencsd/c_api/ocsd_c_api_types.h
+OLD_FILES+=usr/include/opencsd/c_api/ocsd_c_api_cust_fact.h
+OLD_FILES+=usr/include/opencsd/c_api/ocsd_c_api_custom.h
+OLD_DIRS+=usr/include/opencsd/c_api
+OLD_FILES+=usr/include/opencsd/ocsd_if_types.h
+OLD_FILES+=usr/include/opencsd/ptm/trc_dcd_mngr_ptm.h
+OLD_FILES+=usr/include/opencsd/ptm/trc_pkt_proc_ptm.h
+OLD_FILES+=usr/include/opencsd/ptm/trc_cmp_cfg_ptm.h
+OLD_FILES+=usr/include/opencsd/ptm/ptm_decoder.h
+OLD_FILES+=usr/include/opencsd/ptm/trc_pkt_elem_ptm.h
+OLD_FILES+=usr/include/opencsd/ptm/trc_pkt_decode_ptm.h
+OLD_FILES+=usr/include/opencsd/ptm/trc_pkt_types_ptm.h
+OLD_DIRS+=usr/include/opencsd/ptm
+OLD_FILES+=usr/include/opencsd/trc_gen_elem_types.h
+OLD_FILES+=usr/include/opencsd/etmv4/trc_pkt_proc_etmv4.h
+OLD_FILES+=usr/include/opencsd/etmv4/trc_etmv4_stack_elem.h
+OLD_FILES+=usr/include/opencsd/etmv4/etmv4_decoder.h
+OLD_FILES+=usr/include/opencsd/etmv4/trc_pkt_elem_etmv4i.h
+OLD_FILES+=usr/include/opencsd/etmv4/trc_dcd_mngr_etmv4i.h
+OLD_FILES+=usr/include/opencsd/etmv4/trc_pkt_types_etmv4.h
+OLD_FILES+=usr/include/opencsd/etmv4/trc_pkt_elem_etmv4d.h
+OLD_FILES+=usr/include/opencsd/etmv4/trc_pkt_decode_etmv4i.h
+OLD_FILES+=usr/include/opencsd/etmv4/trc_cmp_cfg_etmv4.h
+OLD_DIRS+=usr/include/opencsd/etmv4
+OLD_FILES+=usr/include/opencsd/etmv3/trc_pkt_decode_etmv3.h
+OLD_FILES+=usr/include/opencsd/etmv3/trc_cmp_cfg_etmv3.h
+OLD_FILES+=usr/include/opencsd/etmv3/etmv3_decoder.h
+OLD_FILES+=usr/include/opencsd/etmv3/trc_pkt_proc_etmv3.h
+OLD_FILES+=usr/include/opencsd/etmv3/trc_pkt_elem_etmv3.h
+OLD_FILES+=usr/include/opencsd/etmv3/trc_pkt_types_etmv3.h
+OLD_FILES+=usr/include/opencsd/etmv3/trc_dcd_mngr_etmv3.h
+OLD_DIRS+=usr/include/opencsd/etmv3
+OLD_FILES+=usr/include/opencsd/trc_pkt_types.h
+OLD_FILES+=usr/include/opencsd/stm/trc_pkt_proc_stm.h
+OLD_FILES+=usr/include/opencsd/stm/trc_pkt_types_stm.h
+OLD_FILES+=usr/include/opencsd/stm/stm_decoder.h
+OLD_FILES+=usr/include/opencsd/stm/trc_dcd_mngr_stm.h
+OLD_FILES+=usr/include/opencsd/stm/trc_cmp_cfg_stm.h
+OLD_FILES+=usr/include/opencsd/stm/trc_pkt_elem_stm.h
+OLD_FILES+=usr/include/opencsd/stm/trc_pkt_decode_stm.h
+OLD_DIRS+=usr/include/opencsd/stm
+OLD_DIRS+=usr/include/opencsd
+.endif
OLD_FILES+=usr/include/pmc.h
OLD_FILES+=usr/include/pmclog.h
+OLD_FILES+=usr/include/pmcformat.h
+OLD_FILES+=usr/include/libpmcstat.h
+.if ${TARGET_ARCH} == "amd64"
+OLD_FILES+=usr/lib/libipt.a
+OLD_FILES+=usr/lib/libipt.so
+OLD_LIBS+=lib/libipt.so.0
+OLD_FILES+=usr/lib/libipt_p.a
+.endif
+.if ${TARGET_ARCH} == "aarch64"
+OLD_FILES+=usr/lib/libopencsd.a
+OLD_FILES+=usr/lib/libopencsd.so
+OLD_LIBS+=lib/libopencsd.so.0
+OLD_FILES+=usr/lib/libopencsd_p.a
+.endif
OLD_FILES+=usr/lib/libpmc.a
OLD_FILES+=usr/lib/libpmc.so
OLD_LIBS+=usr/lib/libpmc.so.5
@@ -7773,10 +7841,10 @@ OLD_FILES+=usr/lib32/libpmc.a
OLD_FILES+=usr/lib32/libpmc.so
OLD_LIBS+=usr/lib32/libpmc.so.5
OLD_FILES+=usr/lib32/libpmc_p.a
+OLD_FILES+=usr/sbin/pmc
OLD_FILES+=usr/sbin/pmcannotate
OLD_FILES+=usr/sbin/pmccontrol
OLD_FILES+=usr/sbin/pmcstat
-OLD_FILES+=usr/share/man/man1/pmcstudy.1.gz
OLD_FILES+=usr/share/man/man3/pmc.3.gz
OLD_FILES+=usr/share/man/man3/pmc.atom.3.gz
OLD_FILES+=usr/share/man/man3/pmc.atomsilvermont.3.gz
@@ -7786,6 +7854,7 @@ OLD_FILES+=usr/share/man/man3/pmc.corei7.3.gz
OLD_FILES+=usr/share/man/man3/pmc.corei7uc.3.gz
OLD_FILES+=usr/share/man/man3/pmc.haswell.3.gz
OLD_FILES+=usr/share/man/man3/pmc.haswelluc.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.haswellxeon.3.gz
OLD_FILES+=usr/share/man/man3/pmc.iaf.3.gz
OLD_FILES+=usr/share/man/man3/pmc.ivybridge.3.gz
OLD_FILES+=usr/s
svn commit: r344215 - head/tools/build/mk
Author: avos
Date: Sat Feb 16 16:17:46 2019
New Revision: 344215
URL: https://svnweb.freebsd.org/changeset/base/344215
Log:
Remove corresponding lib32/ files when WITHOUT_OFED=1 is set
MFC after:5 days
MFC with: 344207
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Sat Feb 16 16:01:23
2019(r344214)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Sat Feb 16 16:17:46
2019(r344215)
@@ -7407,6 +7407,56 @@ OLD_FILES+=usr/lib/librdmacm.a
OLD_FILES+=usr/lib/librdmacm.so
OLD_LIBS+=usr/lib/librdmacm.so.1
OLD_FILES+=usr/lib/librdmacm_p.a
+.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
+OLD_FILES+=usr/lib32/libcxgb4.a
+OLD_FILES+=usr/lib32/libcxgb4.so
+OLD_LIBS+=usr/lib32/libcxgb4.so.1
+OLD_FILES+=usr/lib32/libcxgb4_p.a
+OLD_FILES+=usr/lib32/libibcm.a
+OLD_FILES+=usr/lib32/libibcm.so
+OLD_LIBS+=usr/lib32/libibcm.so.1
+OLD_FILES+=usr/lib32/libibcm_p.a
+OLD_FILES+=usr/lib32/libibmad.a
+OLD_FILES+=usr/lib32/libibmad.so
+OLD_LIBS+=usr/lib32/libibmad.so.5
+OLD_FILES+=usr/lib32/libibmad_p.a
+OLD_FILES+=usr/lib32/libibnetdisc.a
+OLD_FILES+=usr/lib32/libibnetdisc.so
+OLD_LIBS+=usr/lib32/libibnetdisc.so.5
+OLD_FILES+=usr/lib32/libibnetdisc_p.a
+OLD_FILES+=usr/lib32/libibumad.a
+OLD_FILES+=usr/lib32/libibumad.so
+OLD_LIBS+=usr/lib32/libibumad.so.1
+OLD_FILES+=usr/lib32/libibumad_p.a
+OLD_FILES+=usr/lib32/libibverbs.a
+OLD_FILES+=usr/lib32/libibverbs.so
+OLD_LIBS+=usr/lib32/libibverbs.so.1
+OLD_FILES+=usr/lib32/libibverbs_p.a
+OLD_FILES+=usr/lib32/libmlx4.a
+OLD_FILES+=usr/lib32/libmlx4.so
+OLD_LIBS+=usr/lib32/libmlx4.so.1
+OLD_FILES+=usr/lib32/libmlx4_p.a
+OLD_FILES+=usr/lib32/libmlx5.a
+OLD_FILES+=usr/lib32/libmlx5.so
+OLD_LIBS+=usr/lib32/libmlx5.so.1
+OLD_FILES+=usr/lib32/libmlx5_p.a
+OLD_FILES+=usr/lib32/libopensm.a
+OLD_FILES+=usr/lib32/libopensm.so
+OLD_LIBS+=usr/lib32/libopensm.so.5
+OLD_FILES+=usr/lib32/libopensm_p.a
+OLD_FILES+=usr/lib32/libosmcomp.a
+OLD_FILES+=usr/lib32/libosmcomp.so
+OLD_LIBS+=usr/lib32/libosmcomp.so.3
+OLD_FILES+=usr/lib32/libosmcomp_p.a
+OLD_FILES+=usr/lib32/libosmvendor.a
+OLD_FILES+=usr/lib32/libosmvendor.so
+OLD_LIBS+=usr/lib32/libosmvendor.so.4
+OLD_FILES+=usr/lib32/libosmvendor_p.a
+OLD_FILES+=usr/lib32/librdmacm.a
+OLD_FILES+=usr/lib32/librdmacm.so
+OLD_LIBS+=usr/lib32/librdmacm.so.1
+OLD_FILES+=usr/lib32/librdmacm_p.a
+.endif
OLD_FILES+=usr/share/man/man1/ibv_asyncwatch.1.gz
OLD_FILES+=usr/share/man/man1/ibv_devices.1.gz
OLD_FILES+=usr/share/man/man1/ibv_devinfo.1.gz
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r344216 - head/tools/build/mk
Author: avos
Date: Sat Feb 16 16:34:23 2019
New Revision: 344216
URL: https://svnweb.freebsd.org/changeset/base/344216
Log:
Few more corrections to WITHOUT_OFED=1 make delete-old removal:
- Drop profile libraries; MK_PROFILE=no is set in all Makefile's.
- Correct library path to libmlx5.so.1 and libibverbs.so.1
MFC after:5 days
MFC with: 344207
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Sat Feb 16 16:17:46
2019(r344215)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Sat Feb 16 16:34:23
2019(r344216)
@@ -7362,100 +7362,76 @@ OLD_DIRS+=usr/include/infiniband
OLD_FILES+=usr/lib/libcxgb4.a
OLD_FILES+=usr/lib/libcxgb4.so
OLD_LIBS+=usr/lib/libcxgb4.so.1
-OLD_FILES+=usr/lib/libcxgb4_p.a
OLD_FILES+=usr/lib/libibcm.a
OLD_FILES+=usr/lib/libibcm.so
OLD_LIBS+=usr/lib/libibcm.so.1
-OLD_FILES+=usr/lib/libibcm_p.a
OLD_FILES+=usr/lib/libibmad.a
OLD_FILES+=usr/lib/libibmad.so
OLD_LIBS+=usr/lib/libibmad.so.5
-OLD_FILES+=usr/lib/libibmad_p.a
OLD_FILES+=usr/lib/libibnetdisc.a
OLD_FILES+=usr/lib/libibnetdisc.so
OLD_LIBS+=usr/lib/libibnetdisc.so.5
-OLD_FILES+=usr/lib/libibnetdisc_p.a
OLD_FILES+=usr/lib/libibumad.a
OLD_FILES+=usr/lib/libibumad.so
OLD_LIBS+=usr/lib/libibumad.so.1
-OLD_FILES+=usr/lib/libibumad_p.a
OLD_FILES+=usr/lib/libibverbs.a
OLD_FILES+=usr/lib/libibverbs.so
-OLD_LIBS+=usr/lib/libibverbs.so.1
-OLD_FILES+=usr/lib/libibverbs_p.a
+OLD_LIBS+=lib/libibverbs.so.1
OLD_FILES+=usr/lib/libmlx4.a
OLD_FILES+=usr/lib/libmlx4.so
OLD_LIBS+=usr/lib/libmlx4.so.1
-OLD_FILES+=usr/lib/libmlx4_p.a
OLD_FILES+=usr/lib/libmlx5.a
OLD_FILES+=usr/lib/libmlx5.so
-OLD_LIBS+=usr/lib/libmlx5.so.1
-OLD_FILES+=usr/lib/libmlx5_p.a
+OLD_LIBS+=lib/libmlx5.so.1
OLD_FILES+=usr/lib/libopensm.a
OLD_FILES+=usr/lib/libopensm.so
OLD_LIBS+=usr/lib/libopensm.so.5
-OLD_FILES+=usr/lib/libopensm_p.a
OLD_FILES+=usr/lib/libosmcomp.a
OLD_FILES+=usr/lib/libosmcomp.so
OLD_LIBS+=usr/lib/libosmcomp.so.3
-OLD_FILES+=usr/lib/libosmcomp_p.a
OLD_FILES+=usr/lib/libosmvendor.a
OLD_FILES+=usr/lib/libosmvendor.so
OLD_LIBS+=usr/lib/libosmvendor.so.4
-OLD_FILES+=usr/lib/libosmvendor_p.a
OLD_FILES+=usr/lib/librdmacm.a
OLD_FILES+=usr/lib/librdmacm.so
OLD_LIBS+=usr/lib/librdmacm.so.1
-OLD_FILES+=usr/lib/librdmacm_p.a
.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
OLD_FILES+=usr/lib32/libcxgb4.a
OLD_FILES+=usr/lib32/libcxgb4.so
OLD_LIBS+=usr/lib32/libcxgb4.so.1
-OLD_FILES+=usr/lib32/libcxgb4_p.a
OLD_FILES+=usr/lib32/libibcm.a
OLD_FILES+=usr/lib32/libibcm.so
OLD_LIBS+=usr/lib32/libibcm.so.1
-OLD_FILES+=usr/lib32/libibcm_p.a
OLD_FILES+=usr/lib32/libibmad.a
OLD_FILES+=usr/lib32/libibmad.so
OLD_LIBS+=usr/lib32/libibmad.so.5
-OLD_FILES+=usr/lib32/libibmad_p.a
OLD_FILES+=usr/lib32/libibnetdisc.a
OLD_FILES+=usr/lib32/libibnetdisc.so
OLD_LIBS+=usr/lib32/libibnetdisc.so.5
-OLD_FILES+=usr/lib32/libibnetdisc_p.a
OLD_FILES+=usr/lib32/libibumad.a
OLD_FILES+=usr/lib32/libibumad.so
OLD_LIBS+=usr/lib32/libibumad.so.1
-OLD_FILES+=usr/lib32/libibumad_p.a
OLD_FILES+=usr/lib32/libibverbs.a
OLD_FILES+=usr/lib32/libibverbs.so
OLD_LIBS+=usr/lib32/libibverbs.so.1
-OLD_FILES+=usr/lib32/libibverbs_p.a
OLD_FILES+=usr/lib32/libmlx4.a
OLD_FILES+=usr/lib32/libmlx4.so
OLD_LIBS+=usr/lib32/libmlx4.so.1
-OLD_FILES+=usr/lib32/libmlx4_p.a
OLD_FILES+=usr/lib32/libmlx5.a
OLD_FILES+=usr/lib32/libmlx5.so
OLD_LIBS+=usr/lib32/libmlx5.so.1
-OLD_FILES+=usr/lib32/libmlx5_p.a
OLD_FILES+=usr/lib32/libopensm.a
OLD_FILES+=usr/lib32/libopensm.so
OLD_LIBS+=usr/lib32/libopensm.so.5
-OLD_FILES+=usr/lib32/libopensm_p.a
OLD_FILES+=usr/lib32/libosmcomp.a
OLD_FILES+=usr/lib32/libosmcomp.so
OLD_LIBS+=usr/lib32/libosmcomp.so.3
-OLD_FILES+=usr/lib32/libosmcomp_p.a
OLD_FILES+=usr/lib32/libosmvendor.a
OLD_FILES+=usr/lib32/libosmvendor.so
OLD_LIBS+=usr/lib32/libosmvendor.so.4
-OLD_FILES+=usr/lib32/libosmvendor_p.a
OLD_FILES+=usr/lib32/librdmacm.a
OLD_FILES+=usr/lib32/librdmacm.so
OLD_LIBS+=usr/lib32/librdmacm.so.1
-OLD_FILES+=usr/lib32/librdmacm_p.a
.endif
OLD_FILES+=usr/share/man/man1/ibv_asyncwatch.1.gz
OLD_FILES+=usr/share/man/man1/ibv_devices.1.gz
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r344221 - in stable: 10/sys/cam/scsi 11/sys/cam/scsi 12/sys/cam/scsi
Author: avos
Date: Sun Feb 17 02:58:44 2019
New Revision: 344221
URL: https://svnweb.freebsd.org/changeset/base/344221
Log:
MFC r343501:
Add NO_6_BYTE / NO_SYNC_CACHE quirks for (C|D|E).* Olympus digital cameras
PR: 97472
Submitted by: Fabio Luis Girardi
Reviewed by: imp
Modified:
stable/12/sys/cam/scsi/scsi_da.c
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/sys/cam/scsi/scsi_da.c
stable/11/sys/cam/scsi/scsi_da.c
Directory Properties:
stable/10/ (props changed)
stable/11/ (props changed)
Modified: stable/12/sys/cam/scsi/scsi_da.c
==
--- stable/12/sys/cam/scsi/scsi_da.cSun Feb 17 02:39:17 2019
(r344220)
+++ stable/12/sys/cam/scsi/scsi_da.cSun Feb 17 02:58:44 2019
(r344221)
@@ -1081,6 +1081,30 @@ static struct da_quirk_entry da_quirk_table[] =
},
{
/*
+* Olympus digital cameras (C-3040ZOOM, C-2040ZOOM, C-1)
+* PR: usb/97472
+*/
+ { T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "C*", "*"},
+ /*quirks*/ DA_Q_NO_6_BYTE | DA_Q_NO_SYNC_CACHE
+ },
+ {
+ /*
+* Olympus digital cameras (D-370)
+* PR: usb/97472
+*/
+ { T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "D*", "*"},
+ /*quirks*/ DA_Q_NO_6_BYTE
+ },
+ {
+ /*
+* Olympus digital cameras (E-100RS, E-10).
+* PR: usb/97472
+*/
+ { T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "E*", "*"},
+ /*quirks*/ DA_Q_NO_6_BYTE | DA_Q_NO_SYNC_CACHE
+ },
+ {
+ /*
* Olympus FE-210 camera
*/
{T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "FE210*",
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r344221 - in stable: 10/sys/cam/scsi 11/sys/cam/scsi 12/sys/cam/scsi
Author: avos
Date: Sun Feb 17 02:58:44 2019
New Revision: 344221
URL: https://svnweb.freebsd.org/changeset/base/344221
Log:
MFC r343501:
Add NO_6_BYTE / NO_SYNC_CACHE quirks for (C|D|E).* Olympus digital cameras
PR: 97472
Submitted by: Fabio Luis Girardi
Reviewed by: imp
Modified:
stable/10/sys/cam/scsi/scsi_da.c
Directory Properties:
stable/10/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/sys/cam/scsi/scsi_da.c
stable/12/sys/cam/scsi/scsi_da.c
Directory Properties:
stable/11/ (props changed)
stable/12/ (props changed)
Modified: stable/10/sys/cam/scsi/scsi_da.c
==
--- stable/10/sys/cam/scsi/scsi_da.cSun Feb 17 02:39:17 2019
(r344220)
+++ stable/10/sys/cam/scsi/scsi_da.cSun Feb 17 02:58:44 2019
(r344221)
@@ -941,6 +941,30 @@ static struct da_quirk_entry da_quirk_table[] =
},
{
/*
+* Olympus digital cameras (C-3040ZOOM, C-2040ZOOM, C-1)
+* PR: usb/97472
+*/
+ { T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "C*", "*"},
+ /*quirks*/ DA_Q_NO_6_BYTE | DA_Q_NO_SYNC_CACHE
+ },
+ {
+ /*
+* Olympus digital cameras (D-370)
+* PR: usb/97472
+*/
+ { T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "D*", "*"},
+ /*quirks*/ DA_Q_NO_6_BYTE
+ },
+ {
+ /*
+* Olympus digital cameras (E-100RS, E-10).
+* PR: usb/97472
+*/
+ { T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "E*", "*"},
+ /*quirks*/ DA_Q_NO_6_BYTE | DA_Q_NO_SYNC_CACHE
+ },
+ {
+ /*
* Olympus FE-210 camera
*/
{T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "FE210*",
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r344223 - stable/11/sys/net80211
Author: avos
Date: Sun Feb 17 03:12:27 2019
New Revision: 344223
URL: https://svnweb.freebsd.org/changeset/base/344223
Log:
MFC r343696:
net80211: do not setup roaming parameters for unsupported modes.
ifconfig(8) prints per-mode parameters if they are non-zero; since
we have 13 possible modes with 3...5 typically supported this change
should greatly reduce amount of information for 'ifconfig list roam'
command.
While here ensure that sta_roam_check() will not use roaming parameters
for unsupported modes (it should not).
This change effectively reverts r188776.
Modified:
stable/11/sys/net80211/ieee80211_scan.c
stable/11/sys/net80211/ieee80211_scan_sta.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/net80211/ieee80211_scan.c
==
--- stable/11/sys/net80211/ieee80211_scan.c Sun Feb 17 03:11:42 2019
(r344222)
+++ stable/11/sys/net80211/ieee80211_scan.c Sun Feb 17 03:12:27 2019
(r344223)
@@ -122,13 +122,21 @@ void
ieee80211_scan_vattach(struct ieee80211vap *vap)
{
struct ieee80211com *ic = vap->iv_ic;
+ int m;
vap->iv_bgscanidle = (IEEE80211_BGSCAN_IDLE_DEFAULT*1000)/hz;
vap->iv_bgscanintvl = IEEE80211_BGSCAN_INTVAL_DEFAULT*hz;
vap->iv_scanvalid = IEEE80211_SCAN_VALID_DEFAULT*hz;
vap->iv_roaming = IEEE80211_ROAMING_AUTO;
- memcpy(vap->iv_roamparms, defroam, sizeof(defroam));
+
+ memset(vap->iv_roamparms, 0, sizeof(vap->iv_roamparms));
+ for (m = IEEE80211_MODE_AUTO + 1; m < IEEE80211_MODE_MAX; m++) {
+ if (isclr(ic->ic_modecaps, m))
+ continue;
+
+ memcpy(&vap->iv_roamparms[m], &defroam[m], sizeof(defroam[m]));
+ }
ic->ic_scan_methods->sc_vattach(vap);
}
Modified: stable/11/sys/net80211/ieee80211_scan_sta.c
==
--- stable/11/sys/net80211/ieee80211_scan_sta.c Sun Feb 17 03:11:42 2019
(r344222)
+++ stable/11/sys/net80211/ieee80211_scan_sta.c Sun Feb 17 03:12:27 2019
(r344223)
@@ -1324,6 +1324,9 @@ sta_roam_check(struct ieee80211_scan_state *ss, struct
mode = ieee80211_chan2mode(ic->ic_bsschan);
roamRate = vap->iv_roamparms[mode].rate;
roamRssi = vap->iv_roamparms[mode].rssi;
+ KASSERT(roamRate != 0 && roamRssi != 0, ("iv_roamparms are not"
+ "initialized for %s mode!", ieee80211_phymode_name[mode]));
+
ucastRate = vap->iv_txparms[mode].ucastrate;
/* NB: the most up to date rssi is in the node, not the scan cache */
curRssi = ic->ic_node_getrssi(ni);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r344223 - stable/11/sys/net80211
Sun, 17 Feb 2019 05:12:27 +0200 було написано Andriy Voskoboinyk : Author: avos Date: Sun Feb 17 03:12:27 2019 New Revision: 344223 URL: https://svnweb.freebsd.org/changeset/base/344223 Log: MFC r343696: net80211: do not setup roaming parameters for unsupported modes. ifconfig(8) prints per-mode parameters if they are non-zero; since we have 13 possible modes with 3...5 typically supported this change should greatly reduce amount of information for 'ifconfig list roam' command. Note for 11-STABLE: here we have only 11 modes (no VHT 2GHz / 5GHz). ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r344221 - in stable: 10/sys/cam/scsi 11/sys/cam/scsi 12/sys/cam/scsi
Author: avos
Date: Sun Feb 17 02:58:44 2019
New Revision: 344221
URL: https://svnweb.freebsd.org/changeset/base/344221
Log:
MFC r343501:
Add NO_6_BYTE / NO_SYNC_CACHE quirks for (C|D|E).* Olympus digital cameras
PR: 97472
Submitted by: Fabio Luis Girardi
Reviewed by: imp
Modified:
stable/11/sys/cam/scsi/scsi_da.c
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/sys/cam/scsi/scsi_da.c
stable/12/sys/cam/scsi/scsi_da.c
Directory Properties:
stable/10/ (props changed)
stable/12/ (props changed)
Modified: stable/11/sys/cam/scsi/scsi_da.c
==
--- stable/11/sys/cam/scsi/scsi_da.cSun Feb 17 02:39:17 2019
(r344220)
+++ stable/11/sys/cam/scsi/scsi_da.cSun Feb 17 02:58:44 2019
(r344221)
@@ -1059,6 +1059,30 @@ static struct da_quirk_entry da_quirk_table[] =
},
{
/*
+* Olympus digital cameras (C-3040ZOOM, C-2040ZOOM, C-1)
+* PR: usb/97472
+*/
+ { T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "C*", "*"},
+ /*quirks*/ DA_Q_NO_6_BYTE | DA_Q_NO_SYNC_CACHE
+ },
+ {
+ /*
+* Olympus digital cameras (D-370)
+* PR: usb/97472
+*/
+ { T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "D*", "*"},
+ /*quirks*/ DA_Q_NO_6_BYTE
+ },
+ {
+ /*
+* Olympus digital cameras (E-100RS, E-10).
+* PR: usb/97472
+*/
+ { T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "E*", "*"},
+ /*quirks*/ DA_Q_NO_6_BYTE | DA_Q_NO_SYNC_CACHE
+ },
+ {
+ /*
* Olympus FE-210 camera
*/
{T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "FE210*",
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r344222 - stable/12/sys/net80211
Author: avos
Date: Sun Feb 17 03:11:42 2019
New Revision: 344222
URL: https://svnweb.freebsd.org/changeset/base/344222
Log:
MFC r343696:
net80211: do not setup roaming parameters for unsupported modes.
ifconfig(8) prints per-mode parameters if they are non-zero; since
we have 13 possible modes with 3...5 typically supported this change
should greatly reduce amount of information for 'ifconfig list roam'
command.
While here ensure that sta_roam_check() will not use roaming parameters
for unsupported modes (it should not).
This change effectively reverts r188776.
Modified:
stable/12/sys/net80211/ieee80211_scan.c
stable/12/sys/net80211/ieee80211_scan_sta.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/net80211/ieee80211_scan.c
==
--- stable/12/sys/net80211/ieee80211_scan.c Sun Feb 17 02:58:44 2019
(r344221)
+++ stable/12/sys/net80211/ieee80211_scan.c Sun Feb 17 03:11:42 2019
(r344222)
@@ -130,13 +130,21 @@ void
ieee80211_scan_vattach(struct ieee80211vap *vap)
{
struct ieee80211com *ic = vap->iv_ic;
+ int m;
vap->iv_bgscanidle = (IEEE80211_BGSCAN_IDLE_DEFAULT*1000)/hz;
vap->iv_bgscanintvl = IEEE80211_BGSCAN_INTVAL_DEFAULT*hz;
vap->iv_scanvalid = IEEE80211_SCAN_VALID_DEFAULT*hz;
vap->iv_roaming = IEEE80211_ROAMING_AUTO;
- memcpy(vap->iv_roamparms, defroam, sizeof(defroam));
+
+ memset(vap->iv_roamparms, 0, sizeof(vap->iv_roamparms));
+ for (m = IEEE80211_MODE_AUTO + 1; m < IEEE80211_MODE_MAX; m++) {
+ if (isclr(ic->ic_modecaps, m))
+ continue;
+
+ memcpy(&vap->iv_roamparms[m], &defroam[m], sizeof(defroam[m]));
+ }
ic->ic_scan_methods->sc_vattach(vap);
}
Modified: stable/12/sys/net80211/ieee80211_scan_sta.c
==
--- stable/12/sys/net80211/ieee80211_scan_sta.c Sun Feb 17 02:58:44 2019
(r344221)
+++ stable/12/sys/net80211/ieee80211_scan_sta.c Sun Feb 17 03:11:42 2019
(r344222)
@@ -1354,6 +1354,9 @@ sta_roam_check(struct ieee80211_scan_state *ss, struct
mode = ieee80211_chan2mode(ic->ic_bsschan);
roamRate = vap->iv_roamparms[mode].rate;
roamRssi = vap->iv_roamparms[mode].rssi;
+ KASSERT(roamRate != 0 && roamRssi != 0, ("iv_roamparms are not"
+ "initialized for %s mode!", ieee80211_phymode_name[mode]));
+
ucastRate = vap->iv_txparms[mode].ucastrate;
/* NB: the most up to date rssi is in the node, not the scan cache */
curRssi = ic->ic_node_getrssi(ni);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r344224 - stable/12/sys/net80211
Author: avos
Date: Sun Feb 17 03:21:18 2019
New Revision: 344224
URL: https://svnweb.freebsd.org/changeset/base/344224
Log:
MFC r343699:
net80211: do not setup Tx parameters for unsupported modes.
That should shorten 'ifconfig list txparam' output since
unsupported modes will not be shown.
Modified:
stable/12/sys/net80211/ieee80211_proto.c
stable/12/sys/net80211/ieee80211_tdma.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/net80211/ieee80211_proto.c
==
--- stable/12/sys/net80211/ieee80211_proto.cSun Feb 17 03:12:27 2019
(r344223)
+++ stable/12/sys/net80211/ieee80211_proto.cSun Feb 17 03:21:18 2019
(r344224)
@@ -347,6 +347,9 @@ ieee80211_proto_vattach(struct ieee80211vap *vap)
* driver and/or user applications.
*/
for (i = IEEE80211_MODE_11A; i < IEEE80211_MODE_MAX; i++) {
+ if (isclr(ic->ic_modecaps, i))
+ continue;
+
const struct ieee80211_rateset *rs = &ic->ic_sup_rates[i];
vap->iv_txparms[i].ucastrate = IEEE80211_FIXED_RATE_NONE;
Modified: stable/12/sys/net80211/ieee80211_tdma.c
==
--- stable/12/sys/net80211/ieee80211_tdma.c Sun Feb 17 03:12:27 2019
(r344223)
+++ stable/12/sys/net80211/ieee80211_tdma.c Sun Feb 17 03:21:18 2019
(r344224)
@@ -127,6 +127,9 @@ static int tdma_process_params(struct ieee80211_node *
static void
settxparms(struct ieee80211vap *vap, enum ieee80211_phymode mode, int rate)
{
+ if (isclr(vap->iv_ic->ic_modecaps, mode))
+ return;
+
vap->iv_txparms[mode].ucastrate = rate;
vap->iv_txparms[mode].mcastrate = rate;
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r344225 - stable/11/sys/net80211
Author: avos
Date: Sun Feb 17 03:21:42 2019
New Revision: 344225
URL: https://svnweb.freebsd.org/changeset/base/344225
Log:
MFC r343699:
net80211: do not setup Tx parameters for unsupported modes.
That should shorten 'ifconfig list txparam' output since
unsupported modes will not be shown.
Modified:
stable/11/sys/net80211/ieee80211_proto.c
stable/11/sys/net80211/ieee80211_tdma.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/net80211/ieee80211_proto.c
==
--- stable/11/sys/net80211/ieee80211_proto.cSun Feb 17 03:21:18 2019
(r344224)
+++ stable/11/sys/net80211/ieee80211_proto.cSun Feb 17 03:21:42 2019
(r344225)
@@ -345,6 +345,9 @@ ieee80211_proto_vattach(struct ieee80211vap *vap)
* driver and/or user applications.
*/
for (i = IEEE80211_MODE_11A; i < IEEE80211_MODE_MAX; i++) {
+ if (isclr(ic->ic_modecaps, i))
+ continue;
+
const struct ieee80211_rateset *rs = &ic->ic_sup_rates[i];
vap->iv_txparms[i].ucastrate = IEEE80211_FIXED_RATE_NONE;
Modified: stable/11/sys/net80211/ieee80211_tdma.c
==
--- stable/11/sys/net80211/ieee80211_tdma.c Sun Feb 17 03:21:18 2019
(r344224)
+++ stable/11/sys/net80211/ieee80211_tdma.c Sun Feb 17 03:21:42 2019
(r344225)
@@ -125,6 +125,9 @@ static int tdma_process_params(struct ieee80211_node *
static void
settxparms(struct ieee80211vap *vap, enum ieee80211_phymode mode, int rate)
{
+ if (isclr(vap->iv_ic->ic_modecaps, mode))
+ return;
+
vap->iv_txparms[mode].ucastrate = rate;
vap->iv_txparms[mode].mcastrate = rate;
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r344244 - head/usr.sbin/rpc.ypupdated
Author: avos
Date: Mon Feb 18 03:15:25 2019
New Revision: 344244
URL: https://svnweb.freebsd.org/changeset/base/344244
Log:
Fix memory / resource leaks in usr.sbin/rpc.ypupdated/update.c
Re-apply r343909 to this file to get the issue fixed.
PR: 204956
Reported by: David Binderman
MFC after:5 days
Modified:
head/usr.sbin/rpc.ypupdated/update.c
Modified: head/usr.sbin/rpc.ypupdated/update.c
==
--- head/usr.sbin/rpc.ypupdated/update.cMon Feb 18 02:59:47 2019
(r344243)
+++ head/usr.sbin/rpc.ypupdated/update.cMon Feb 18 03:15:25 2019
(r344244)
@@ -263,11 +263,14 @@ localupdate(char *name, char *filename, u_int op, u_in
sprintf(tmpname, "%s.tmp", filename);
rf = fopen(filename, "r");
if (rf == NULL) {
- return (ERR_READ);
+ err = ERR_READ;
+ goto cleanup;
}
wf = fopen(tmpname, "w");
if (wf == NULL) {
- return (ERR_WRITE);
+ fclose(rf);
+ err = ERR_WRITE;
+ goto cleanup;
}
err = -1;
while (fgets(line, sizeof (line), rf)) {
@@ -307,13 +310,17 @@ localupdate(char *name, char *filename, u_int op, u_in
fclose(rf);
if (err == 0) {
if (rename(tmpname, filename) < 0) {
- return (ERR_DBASE);
+ err = ERR_DBASE;
+ goto cleanup;
}
} else {
if (unlink(tmpname) < 0) {
- return (ERR_DBASE);
+ err = ERR_DBASE;
+ goto cleanup;
}
}
+cleanup:
+ free(tmpname);
return (err);
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r344245 - head/usr.sbin/bsnmpd/modules/snmp_hostres
Author: avos
Date: Mon Feb 18 03:23:10 2019
New Revision: 344245
URL: https://svnweb.freebsd.org/changeset/base/344245
Log:
snmp_hostres(3): fix a typo in sanity checks in handle_chunk()
PR: 204253
Submitted by: David Binderman
MFC after:5 days
Modified:
head/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c
Modified: head/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c
==
--- head/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c Mon Feb
18 03:15:25 2019(r344244)
+++ head/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c Mon Feb
18 03:23:10 2019(r344245)
@@ -312,7 +312,7 @@ handle_chunk(int32_t ds_index, const char *chunk_name,
assert(chunk_name != NULL);
assert(chunk_name[0] != '\0');
- if (chunk_name == NULL || chunk_name == '\0')
+ if (chunk_name == NULL || chunk_name[0] == '\0')
return;
HRDBG("ANALYZE chunk %s", chunk_name);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r344431 - in stable/10/sys: conf dev/ata
Author: avos
Date: Thu Feb 21 09:54:57 2019
New Revision: 344431
URL: https://svnweb.freebsd.org/changeset/base/344431
Log:
MFC r344198:
GC ATA_REQUEST_TIMEOUT option remnants
It was removed from code in r249083 and from sys/conf/options in r249213.
PR: 193935, 222170
Modified:
stable/10/sys/conf/NOTES
stable/10/sys/dev/ata/ata-all.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/conf/NOTES
==
--- stable/10/sys/conf/NOTESThu Feb 21 09:54:10 2019(r344430)
+++ stable/10/sys/conf/NOTESThu Feb 21 09:54:57 2019(r344431)
@@ -1765,11 +1765,8 @@ hint.ata.1.irq="15"
#
# ATA_STATIC_ID: controller numbering is static ie depends on location
# else the device numbers are dynamically allocated.
-# ATA_REQUEST_TIMEOUT: the number of seconds to wait for an ATA request
-# before timing out.
optionsATA_STATIC_ID
-#options ATA_REQUEST_TIMEOUT=10
#
# Standard floppy disk controllers and floppy tapes, supports
Modified: stable/10/sys/dev/ata/ata-all.h
==
--- stable/10/sys/dev/ata/ata-all.h Thu Feb 21 09:54:10 2019
(r344430)
+++ stable/10/sys/dev/ata/ata-all.h Thu Feb 21 09:54:57 2019
(r344431)
@@ -207,10 +207,6 @@
#define ATA_OP_FINISHED 1
#define ATA_MAX_28BIT_LBA 268435455UL
-#ifndefATA_REQUEST_TIMEOUT
-#defineATA_REQUEST_TIMEOUT 10
-#endif
-
/* structure used for composite atomic operations */
#define MAX_COMPOSITES 32 /* u_int32_t bits */
struct ata_composite {
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r344430 - in stable: 11/sys/conf 11/sys/dev/ata 12/sys/conf 12/sys/dev/ata
Author: avos
Date: Thu Feb 21 09:54:10 2019
New Revision: 344430
URL: https://svnweb.freebsd.org/changeset/base/344430
Log:
MFC r344198:
GC ATA_REQUEST_TIMEOUT option remnants
It was removed from code in r249083 and from sys/conf/options in r249213.
PR: 193935, 222170
Modified:
stable/12/sys/conf/NOTES
stable/12/sys/dev/ata/ata-all.h
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/sys/conf/NOTES
stable/11/sys/dev/ata/ata-all.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/12/sys/conf/NOTES
==
--- stable/12/sys/conf/NOTESThu Feb 21 09:43:14 2019(r344429)
+++ stable/12/sys/conf/NOTESThu Feb 21 09:54:10 2019(r344430)
@@ -1813,14 +1813,6 @@ hint.ata.1.port="0x170"
hint.ata.1.irq="15"
#
-# The following options are valid on the ATA driver:
-#
-# ATA_REQUEST_TIMEOUT: the number of seconds to wait for an ATA request
-# before timing out.
-
-#options ATA_REQUEST_TIMEOUT=10
-
-#
# Standard floppy disk controllers and floppy tapes, supports
# the Y-E DATA External FDD (PC Card)
#
Modified: stable/12/sys/dev/ata/ata-all.h
==
--- stable/12/sys/dev/ata/ata-all.h Thu Feb 21 09:43:14 2019
(r344429)
+++ stable/12/sys/dev/ata/ata-all.h Thu Feb 21 09:54:10 2019
(r344430)
@@ -203,10 +203,6 @@
#define ATA_OP_FINISHED 1
#define ATA_MAX_28BIT_LBA 268435455UL
-#ifndefATA_REQUEST_TIMEOUT
-#defineATA_REQUEST_TIMEOUT 10
-#endif
-
/* structure used for composite atomic operations */
#define MAX_COMPOSITES 32 /* u_int32_t bits */
struct ata_composite {
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r344430 - in stable: 11/sys/conf 11/sys/dev/ata 12/sys/conf 12/sys/dev/ata
Author: avos
Date: Thu Feb 21 09:54:10 2019
New Revision: 344430
URL: https://svnweb.freebsd.org/changeset/base/344430
Log:
MFC r344198:
GC ATA_REQUEST_TIMEOUT option remnants
It was removed from code in r249083 and from sys/conf/options in r249213.
PR: 193935, 222170
Modified:
stable/11/sys/conf/NOTES
stable/11/sys/dev/ata/ata-all.h
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/12/sys/conf/NOTES
stable/12/sys/dev/ata/ata-all.h
Directory Properties:
stable/12/ (props changed)
Modified: stable/11/sys/conf/NOTES
==
--- stable/11/sys/conf/NOTESThu Feb 21 09:43:14 2019(r344429)
+++ stable/11/sys/conf/NOTESThu Feb 21 09:54:10 2019(r344430)
@@ -1785,14 +1785,6 @@ hint.ata.1.port="0x170"
hint.ata.1.irq="15"
#
-# The following options are valid on the ATA driver:
-#
-# ATA_REQUEST_TIMEOUT: the number of seconds to wait for an ATA request
-# before timing out.
-
-#options ATA_REQUEST_TIMEOUT=10
-
-#
# Standard floppy disk controllers and floppy tapes, supports
# the Y-E DATA External FDD (PC Card)
#
Modified: stable/11/sys/dev/ata/ata-all.h
==
--- stable/11/sys/dev/ata/ata-all.h Thu Feb 21 09:43:14 2019
(r344429)
+++ stable/11/sys/dev/ata/ata-all.h Thu Feb 21 09:54:10 2019
(r344430)
@@ -207,10 +207,6 @@
#define ATA_OP_FINISHED 1
#define ATA_MAX_28BIT_LBA 268435455UL
-#ifndefATA_REQUEST_TIMEOUT
-#defineATA_REQUEST_TIMEOUT 10
-#endif
-
/* structure used for composite atomic operations */
#define MAX_COMPOSITES 32 /* u_int32_t bits */
struct ata_composite {
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r344454 - in stable: 11/tools/build/mk 12/tools/build/mk
Author: avos
Date: Thu Feb 21 23:53:52 2019
New Revision: 344454
URL: https://svnweb.freebsd.org/changeset/base/344454
Log:
MFC r344201:
Remove vi(1)-related files via 'make delete-old' when WITHOUT_VI=1 is set.
Modified:
stable/11/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/12/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/12/ (props changed)
Modified: stable/11/tools/build/mk/OptionalObsoleteFiles.inc
==
--- stable/11/tools/build/mk/OptionalObsoleteFiles.inc Thu Feb 21 22:56:54
2019(r344453)
+++ stable/11/tools/build/mk/OptionalObsoleteFiles.inc Thu Feb 21 23:53:52
2019(r344454)
@@ -9339,6 +9339,32 @@ OLD_FILES+=usr/share/man/man8/lastlogin.8.gz
OLD_FILES+=usr/share/man/man8/utx.8.gz
.endif
+.if ${MK_VI} == no
+OLD_FILES+=etc/rc.d/virecover
+OLD_FILES+=rescue/ex
+OLD_FILES+=rescue/vi
+OLD_FILES+=usr/bin/ex
+OLD_FILES+=usr/bin/nex
+OLD_FILES+=usr/bin/nvi
+OLD_FILES+=usr/bin/nview
+OLD_FILES+=usr/bin/vi
+OLD_FILES+=usr/bin/view
+OLD_FILES+=usr/share/man/man1/ex.1.gz
+OLD_FILES+=usr/share/man/man1/nex.1.gz
+OLD_FILES+=usr/share/man/man1/nvi.1.gz
+OLD_FILES+=usr/share/man/man1/nview.1.gz
+OLD_FILES+=usr/share/man/man1/vi.1.gz
+OLD_FILES+=usr/share/man/man1/view.1.gz
+. if exists(${DESTDIR}/usr/share/vi)
+VI_DIRS!=find ${DESTDIR}/usr/share/vi -type d \
+| sed -e 's,^${DESTDIR}/,,'; echo
+VI_FILES!=find ${DESTDIR}/usr/share/vi \! -type d \
+| sed -e 's,^${DESTDIR}/,,'; echo
+OLD_DIRS+=${VI_DIRS}
+OLD_FILES+=${VI_FILES}
+. endif
+.endif
+
.if ${MK_WIRELESS} == no
OLD_FILES+=etc/regdomain.xml
OLD_FILES+=etc/rc.d/hostapd
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
