[src-draft/trunk]: src/sys/dev/usb Software crypto definitions from FreeBSD.

[nat <nat%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src-all/rev/f9a1f1d67ec4
branches:  trunk
changeset: 939116:f9a1f1d67ec4
user:      nat <nat%NetBSD.org@localhost>
date:      Mon Apr 27 07:38:25 2020 +0000

description:
Software crypto definitions from FreeBSD.

diffstat:

 sys/dev/usb/if_urtwn.c |  11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diffs (33 lines):

diff -r 4d2d0402fb3d -r f9a1f1d67ec4 sys/dev/usb/if_urtwn.c
--- a/sys/dev/usb/if_urtwn.c    Mon Apr 27 07:40:50 2020 +0000
+++ b/sys/dev/usb/if_urtwn.c    Mon Apr 27 07:38:25 2020 +0000
@@ -1,4 +1,8 @@
+<<<<<<< /home/martin/wifi/sys/dev/usb/if_urtwn.c
 /*     $NetBSD: if_urtwn.c,v 1.88 2020/06/27 14:34:45 jdolecek Exp $   */
+=======
+/*     $NetBSD: if_urtwn.c,v 1.59.2.18 2020/04/27 07:38:25 nat Exp $   */
+>>>>>>> /tmp/if_urtwn~other.gryu3ffz.c
 /*     $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $       */
 
 /*-
@@ -42,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.88 2020/06/27 14:34:45 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.59.2.18 2020/04/27 07:38:25 nat Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -527,6 +531,11 @@
            IEEE80211_HTCAP_SHORTGI40;          /* short GI in 40MHz */
 #endif
 
+       ic->ic_cryptocaps =
+               IEEE80211_CRYPTO_WEP |
+               IEEE80211_CRYPTO_TKIP |
+               IEEE80211_CRYPTO_AES_CCM;
+
        ic->ic_txstream = sc->ntxchains;
        ic->ic_rxstream = sc->nrxchains;