svn commit: r289168 - in head/sys/dev: iwm otus ral usb/wlan
Adrian Chadd
adrian at FreeBSD.org
Mon Oct 12 05:21:54 UTC 2015
Author: adrian
Date: Mon Oct 12 05:21:51 2015
New Revision: 289168
URL: https://svnweb.freebsd.org/changeset/base/289168
Log:
net80211 drivers: eliminate any references to sc_rxtap_len/sc_txtap_len (never used here)
Submitted by: <s3erios at gmail.com>
Differential Revision: https://reviews.freebsd.org/D3776
Modified:
head/sys/dev/iwm/if_iwmvar.h
head/sys/dev/otus/if_otus.c
head/sys/dev/otus/if_otusreg.h
head/sys/dev/ral/rt2560var.h
head/sys/dev/ral/rt2661var.h
head/sys/dev/ral/rt2860var.h
head/sys/dev/usb/wlan/if_rsureg.h
head/sys/dev/usb/wlan/if_runvar.h
head/sys/dev/usb/wlan/if_uathvar.h
head/sys/dev/usb/wlan/if_upgtvar.h
head/sys/dev/usb/wlan/if_uralvar.h
head/sys/dev/usb/wlan/if_urtwnvar.h
head/sys/dev/usb/wlan/if_urtwvar.h
head/sys/dev/usb/wlan/if_zydreg.h
Modified: head/sys/dev/iwm/if_iwmvar.h
==============================================================================
--- head/sys/dev/iwm/if_iwmvar.h Mon Oct 12 05:14:49 2015 (r289167)
+++ head/sys/dev/iwm/if_iwmvar.h Mon Oct 12 05:21:51 2015 (r289168)
@@ -496,14 +496,12 @@ struct iwm_softc {
uint8_t pad[IEEE80211_RADIOTAP_HDRLEN];
} sc_rxtapu;
#define sc_rxtap sc_rxtapu.th
- int sc_rxtap_len;
union {
struct iwm_tx_radiotap_header th;
uint8_t pad[IEEE80211_RADIOTAP_HDRLEN];
} sc_txtapu;
#define sc_txtap sc_txtapu.th
- int sc_txtap_len;
int sc_max_rssi;
};
Modified: head/sys/dev/otus/if_otus.c
==============================================================================
--- head/sys/dev/otus/if_otus.c Mon Oct 12 05:14:49 2015 (r289167)
+++ head/sys/dev/otus/if_otus.c Mon Oct 12 05:21:51 2015 (r289168)
@@ -1712,7 +1712,6 @@ otus_sub_rxeof(struct otus_softc *sc, ui
break;
}
mb.m_data = (caddr_t)tap;
- mb.m_len = sc->sc_rxtap_len;
mb.m_next = m;
mb.m_nextpkt = NULL;
mb.m_type = 0;
Modified: head/sys/dev/otus/if_otusreg.h
==============================================================================
--- head/sys/dev/otus/if_otusreg.h Mon Oct 12 05:14:49 2015 (r289167)
+++ head/sys/dev/otus/if_otusreg.h Mon Oct 12 05:21:51 2015 (r289168)
@@ -1017,14 +1017,12 @@ struct otus_softc {
uint8_t pad[64];
} sc_rxtapu;
#define sc_rxtap sc_rxtapu.th
- int sc_rxtap_len;
union {
struct otus_tx_radiotap_header th;
uint8_t pad[64];
} sc_txtapu;
#define sc_txtap sc_txtapu.th
- int sc_txtap_len;
};
#endif /* __IF_OTUSREG_H__ */
Modified: head/sys/dev/ral/rt2560var.h
==============================================================================
--- head/sys/dev/ral/rt2560var.h Mon Oct 12 05:14:49 2015 (r289167)
+++ head/sys/dev/ral/rt2560var.h Mon Oct 12 05:21:51 2015 (r289168)
@@ -146,10 +146,8 @@ struct rt2560_softc {
int nb_ant;
struct rt2560_rx_radiotap_header sc_rxtap;
- int sc_rxtap_len;
-
struct rt2560_tx_radiotap_header sc_txtap;
- int sc_txtap_len;
+
#define RT2560_F_INPUT_RUNNING 0x1
#define RT2560_F_RUNNING 0x2
int sc_flags;
Modified: head/sys/dev/ral/rt2661var.h
==============================================================================
--- head/sys/dev/ral/rt2661var.h Mon Oct 12 05:14:49 2015 (r289167)
+++ head/sys/dev/ral/rt2661var.h Mon Oct 12 05:21:51 2015 (r289168)
@@ -157,9 +157,7 @@ struct rt2661_softc {
int dwelltime;
struct rt2661_rx_radiotap_header sc_rxtap;
- int sc_rxtap_len;
struct rt2661_tx_radiotap_header sc_txtap;
- int sc_txtap_len;
};
int rt2661_attach(device_t, int);
Modified: head/sys/dev/ral/rt2860var.h
==============================================================================
--- head/sys/dev/ral/rt2860var.h Mon Oct 12 05:14:49 2015 (r289167)
+++ head/sys/dev/ral/rt2860var.h Mon Oct 12 05:21:51 2015 (r289168)
@@ -194,9 +194,7 @@ struct rt2860_softc {
uint32_t txpow40mhz_5ghz[5];
struct rt2860_rx_radiotap_header sc_rxtap;
- int sc_rxtap_len;
struct rt2860_tx_radiotap_header sc_txtap;
- int sc_txtap_len;
};
int rt2860_attach(device_t, int);
Modified: head/sys/dev/usb/wlan/if_rsureg.h
==============================================================================
--- head/sys/dev/usb/wlan/if_rsureg.h Mon Oct 12 05:14:49 2015 (r289167)
+++ head/sys/dev/usb/wlan/if_rsureg.h Mon Oct 12 05:21:51 2015 (r289168)
@@ -793,12 +793,10 @@ struct rsu_softc {
uint8_t pad[64];
} sc_rxtapu;
#define sc_rxtap sc_rxtapu.th
- int sc_rxtap_len;
union {
struct rsu_tx_radiotap_header th;
uint8_t pad[64];
} sc_txtapu;
#define sc_txtap sc_txtapu.th
- int sc_txtap_len;
};
Modified: head/sys/dev/usb/wlan/if_runvar.h
==============================================================================
--- head/sys/dev/usb/wlan/if_runvar.h Mon Oct 12 05:14:49 2015 (r289167)
+++ head/sys/dev/usb/wlan/if_runvar.h Mon Oct 12 05:21:51 2015 (r289168)
@@ -253,14 +253,12 @@ struct run_softc {
uint8_t pad[64];
} sc_rxtapu;
#define sc_rxtap sc_rxtapu.th
- int sc_rxtap_len;
union {
struct run_tx_radiotap_header th;
uint8_t pad[64];
} sc_txtapu;
#define sc_txtap sc_txtapu.th
- int sc_txtap_len;
};
#define RUN_LOCK(sc) mtx_lock(&(sc)->sc_mtx)
Modified: head/sys/dev/usb/wlan/if_uathvar.h
==============================================================================
--- head/sys/dev/usb/wlan/if_uathvar.h Mon Oct 12 05:14:49 2015 (r289167)
+++ head/sys/dev/usb/wlan/if_uathvar.h Mon Oct 12 05:21:51 2015 (r289168)
@@ -230,9 +230,7 @@ struct uath_softc {
#define UATH_FLAG_INITDONE (1 << 2)
struct uath_rx_radiotap_header sc_rxtap;
- int sc_rxtap_len;
struct uath_tx_radiotap_header sc_txtap;
- int sc_txtap_len;
};
#define UATH_LOCK(sc) mtx_lock(&(sc)->sc_mtx)
Modified: head/sys/dev/usb/wlan/if_upgtvar.h
==============================================================================
--- head/sys/dev/usb/wlan/if_upgtvar.h Mon Oct 12 05:14:49 2015 (r289167)
+++ head/sys/dev/usb/wlan/if_upgtvar.h Mon Oct 12 05:21:51 2015 (r289168)
@@ -472,9 +472,7 @@ struct upgt_softc {
/* BPF */
struct upgt_rx_radiotap_header sc_rxtap;
- int sc_rxtap_len;
struct upgt_tx_radiotap_header sc_txtap;
- int sc_txtap_len;
};
#define UPGT_LOCK(sc) mtx_lock(&(sc)->sc_mtx)
Modified: head/sys/dev/usb/wlan/if_uralvar.h
==============================================================================
--- head/sys/dev/usb/wlan/if_uralvar.h Mon Oct 12 05:14:49 2015 (r289167)
+++ head/sys/dev/usb/wlan/if_uralvar.h Mon Oct 12 05:21:51 2015 (r289168)
@@ -125,10 +125,7 @@ struct ural_softc {
int nb_ant;
struct ural_rx_radiotap_header sc_rxtap;
- int sc_rxtap_len;
-
struct ural_tx_radiotap_header sc_txtap;
- int sc_txtap_len;
};
#define RAL_LOCK(sc) mtx_lock(&(sc)->sc_mtx)
Modified: head/sys/dev/usb/wlan/if_urtwnvar.h
==============================================================================
--- head/sys/dev/usb/wlan/if_urtwnvar.h Mon Oct 12 05:14:49 2015 (r289167)
+++ head/sys/dev/usb/wlan/if_urtwnvar.h Mon Oct 12 05:21:51 2015 (r289168)
@@ -195,12 +195,9 @@ struct urtwn_softc {
struct usb_xfer *sc_xfer[URTWN_N_TRANSFER];
struct urtwn_rx_radiotap_header sc_rxtap;
- int sc_rxtap_len;
-
struct urtwn_tx_radiotap_header sc_txtap;
- int sc_txtap_len;
};
#define URTWN_LOCK(sc) mtx_lock(&(sc)->sc_mtx)
#define URTWN_UNLOCK(sc) mtx_unlock(&(sc)->sc_mtx)
-#define URTWN_ASSERT_LOCKED(sc) mtx_assert(&(sc)->sc_mtx, MA_OWNED)
\ No newline at end of file
+#define URTWN_ASSERT_LOCKED(sc) mtx_assert(&(sc)->sc_mtx, MA_OWNED)
Modified: head/sys/dev/usb/wlan/if_urtwvar.h
==============================================================================
--- head/sys/dev/usb/wlan/if_urtwvar.h Mon Oct 12 05:14:49 2015 (r289167)
+++ head/sys/dev/usb/wlan/if_urtwvar.h Mon Oct 12 05:21:51 2015 (r289168)
@@ -178,9 +178,7 @@ struct urtw_softc {
struct urtw_stats sc_stats;
struct urtw_rx_radiotap_header sc_rxtap;
- int sc_rxtap_len;
struct urtw_tx_radiotap_header sc_txtap;
- int sc_txtap_len;
};
#define URTW_LOCK(sc) mtx_lock(&(sc)->sc_mtx)
Modified: head/sys/dev/usb/wlan/if_zydreg.h
==============================================================================
--- head/sys/dev/usb/wlan/if_zydreg.h Mon Oct 12 05:14:49 2015 (r289167)
+++ head/sys/dev/usb/wlan/if_zydreg.h Mon Oct 12 05:21:51 2015 (r289168)
@@ -1304,9 +1304,7 @@ struct zyd_softc {
struct zyd_cmd sc_ibuf;
struct zyd_rx_radiotap_header sc_rxtap;
- int sc_rxtap_len;
struct zyd_tx_radiotap_header sc_txtap;
- int sc_txtap_len;
};
#define ZYD_LOCK(sc) mtx_lock(&(sc)->sc_mtx)
More information about the svn-src-all
mailing list