[src-draft/trunk]: src/sys/dev/pci Twice is double the charm - but not when e...

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

details:   https://anonhg.NetBSD.org/src-all/rev/37de2c649c96
branches:  trunk
changeset: 363813:37de2c649c96
user:      Martin Husemann <martin%NetBSD.org@localhost>
date:      Fri Feb 12 20:13:04 2021 +0100

description:
Twice is double the charm - but not when encrypting packets.

Fix merge botch that caused all outgoing encrypted packets to be
run through the cipher twice (once before queuing, and another time
after unqueueing before handing over to the hardware).

diffstat:

 sys/dev/pci/if_rtwn.c |  6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diffs (16 lines):

diff -r b8d361b0d21c -r 37de2c649c96 sys/dev/pci/if_rtwn.c
--- a/sys/dev/pci/if_rtwn.c     Fri Feb 12 18:40:43 2021 +0100
+++ b/sys/dev/pci/if_rtwn.c     Fri Feb 12 20:13:04 2021 +0100
@@ -2182,12 +2182,6 @@
 
                bpf_mtap(vap->iv_ifp, m, BPF_D_OUT);
 
-               if ((m = ieee80211_encap(vap, ni, m)) == NULL) {
-                       ieee80211_free_node(ni);
-                       if_statinc(vap->iv_ifp, if_oerrors);
-                       continue;
-               }
-
                if (rtwn_raw_xmit(ni, m, NULL) != 0) {
                        ieee80211_free_node(ni);
                        if (vap != NULL)