[src-draft/trunk]: src Sync to phill wifi.

[Nathanial Sloss <nat%netbsd.org@localhost>]

details:   https://anonhg.NetBSD.org/src-all/rev/306bcabd17f8
branches:  trunk
changeset: 947949:306bcabd17f8
user:      Nathanial Sloss <nat%netbsd.org@localhost>
date:      Fri May 08 07:17:20 2020 +1000

description:
Sync to phill wifi.

diffstat:

 sys/arch/evbarm/conf/TEST       |  23 +++++++++++++++++++++++
 sys/net80211/ieee80211_mesh.c   |   2 +-
 sys/net80211/ieee80211_netbsd.c |   6 +++++-
 3 files changed, 29 insertions(+), 2 deletions(-)

diffs (65 lines):

diff -r bbf00499acfc -r 306bcabd17f8 sys/arch/evbarm/conf/TEST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/evbarm/conf/TEST Fri May 08 07:17:20 2020 +1000
@@ -0,0 +1,23 @@
+# Test kernel for martins main wifi test machine
+
+include         "arch/evbarm/conf/GENERIC64"
+
+# Diagnostic/debugging support options
+options        DIAGNOSTIC      # inexpensive kernel consistency checks
+                               # XXX to be commented out on release branch
+options        DEBUG           # expensive debugging checks/support
+options        LOCKDEBUG       # expensive locking checks/support
+
+options                URTWN_DEBUG     # debug the urtwn driver
+options                IEEE80211_DEBUG # debug 802.11 code
+
+no athn*
+no bwfm*
+no atu*
+no otus*
+no rum*
+no run*
+no upgt*
+no ural*
+no urtw*
+no zyd*
diff -r bbf00499acfc -r 306bcabd17f8 sys/net80211/ieee80211_mesh.c
--- a/sys/net80211/ieee80211_mesh.c     Fri May 08 07:12:59 2020 +1000
+++ b/sys/net80211/ieee80211_mesh.c     Fri May 08 07:17:20 2020 +1000
@@ -1363,7 +1363,7 @@
                }
        }
 #ifndef __NO_STRICT_ALIGNMENT
-       if (!ALIGNED_POINTER(mtod(m, caddr_t) + sizeof(*eh), uint32_t)) {
+       if (!ALIGNED_POINTER(mtod(m, char*) + sizeof(*eh), uint32_t)) {
                m = ieee80211_realign(vap, m, sizeof(*eh));
                if (m == NULL)
                        return NULL;
diff -r bbf00499acfc -r 306bcabd17f8 sys/net80211/ieee80211_netbsd.c
--- a/sys/net80211/ieee80211_netbsd.c   Fri May 08 07:12:59 2020 +1000
+++ b/sys/net80211/ieee80211_netbsd.c   Fri May 08 07:17:20 2020 +1000
@@ -633,10 +633,11 @@
 struct mbuf *
 ieee80211_realign(struct ieee80211vap *vap, struct mbuf *m, size_t align)
 {
-       int pktlen, space;
+       int pktlen; // , space;
        struct mbuf *n;
 
        pktlen = m->m_pkthdr.len;
+#if 0 // MMM
        space = pktlen + align;
        if (space < MINCLSIZE)
                n = m_gethdr(M_NOWAIT, MT_DATA);
@@ -648,6 +649,9 @@
 #endif
                    space <= MJUM9BYTES ?   MJUM9BYTES : MJUM16BYTES);
        }
+#else
+       n = m_gethdr(M_NOWAIT, MT_DATA);
+#endif
        if (__predict_true(n != NULL)) {
                m_move_pkthdr(n, m);
                n->m_data = (caddr_t)(ALIGN(n->m_data + align) - align);