Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src-draft/trunk]: src/sys/dev/pci Fix botched merge of local patch.



details:   https://anonhg.NetBSD.org/src-all/rev/a13c714e1745
branches:  trunk
changeset: 360867:a13c714e1745
user:      Nathanial Sloss <nat%netbsd.org@localhost>
date:      Wed Jul 01 20:54:21 2020 +1000

description:
Fix botched merge of local patch.

diffstat:

 sys/dev/pci/if_iwn.c |  3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diffs (14 lines):

diff -r 879c98befa5a -r a13c714e1745 sys/dev/pci/if_iwn.c
--- a/sys/dev/pci/if_iwn.c      Wed Jul 01 12:32:45 2020 +1000
+++ b/sys/dev/pci/if_iwn.c      Wed Jul 01 20:54:21 2020 +1000
@@ -2593,9 +2593,8 @@
        } else {
 
                /* No node found ... process differently. */
-       }
-
                (void) ieee80211_input_all(ic, m, rssi + 116, 0);
+       }
        splx(s);
 }
 



Home | Main Index | Thread Index | Old Index