[src-draft/trunk]: src/sys/net80211 Fix merge botches

[Martin Husemann <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src-all/rev/c17bf3d20856
branches:  trunk
changeset: 939650:c17bf3d20856
user:      Martin Husemann <martin%NetBSD.org@localhost>
date:      Fri Sep 25 21:23:17 2020 +0200

description:
Fix merge botches

diffstat:

 sys/net80211/ieee80211_crypto_ccmp.c |  7 ++++---
 sys/net80211/ieee80211_proto.c       |  1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r 8300fba5b6e6 -r c17bf3d20856 sys/net80211/ieee80211_crypto_ccmp.c
--- a/sys/net80211/ieee80211_crypto_ccmp.c      Fri Sep 25 19:54:08 2020 +0200
+++ b/sys/net80211/ieee80211_crypto_ccmp.c      Fri Sep 25 21:23:17 2020 +0200
@@ -62,6 +62,7 @@
 #endif
 #ifdef __NetBSD__
 #include <net/route.h>
+#include <net/if_ether.h>
 #endif
 
 #include <net80211/ieee80211_var.h>
@@ -387,7 +388,7 @@
         * a QOS frame.
         */
        if (IEEE80211_IS_DSTODS(wh)) {
-               IEEE80211_ADDR_COPY(aad + 24,
+               IEEE80211_ADDR_COPY(ad + 24,
                        ((struct ieee80211_frame_addr4 *)wh)->i_addr4);
                if (IS_QOS_DATA(wh)) {
                        const struct ieee80211_qosframe_addr4 *qwh4 =
@@ -469,10 +470,10 @@
 
        if (!aes_ccm_dec_mbuf(&aes_ccm, m, hdrlen + ccmp.ic_header, data_len,
                mic)) {
-               IEEE80211_DPRINTF(ctx->cc_ic, IEEE80211_MSG_CRYPTO,
+               IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO,
                    "[%s] AES-CCM decrypt failed; MIC mismatch\n",
                    ether_sprintf(wh->i_addr2));
-               ctx->cc_ic->ic_stats.is_rx_ccmpmic++;
+               vap->iv_stats.is_rx_ccmpmic++;
                return 0;
        }
        return 1;
diff -r 8300fba5b6e6 -r c17bf3d20856 sys/net80211/ieee80211_proto.c
--- a/sys/net80211/ieee80211_proto.c    Fri Sep 25 19:54:08 2020 +0200
+++ b/sys/net80211/ieee80211_proto.c    Fri Sep 25 21:23:17 2020 +0200
@@ -1994,7 +1994,6 @@
 
 #if __NetBSD__
        IEEE80211_UNLOCK(ic);
->>>>>>> /tmp/ieee80211_proto~other.gj8761mu.c
 #endif
 }