[src/netbsd-6]: src/external/bsd/wpa/dist/src/drivers Pull up following revis...

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

details:   https://anonhg.NetBSD.org/src/rev/9195b2bc1e4a
branches:  netbsd-6
changeset: 776903:9195b2bc1e4a
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Feb 16 08:25:31 2015 +0000

description:
Pull up following revision(s) (requested by khorben in ticket #1255):
        external/bsd/wpa/dist/src/drivers/driver_bsd.c: revision 1.8
        external/bsd/wpa/dist/src/drivers/driver_bsd.c: revision 1.9
CID 272959: NULL deref
Pass the scan result RSSI to the WPA code in a way that it understands.

diffstat:

 external/bsd/wpa/dist/src/drivers/driver_bsd.c |  13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diffs (31 lines):

diff -r af066152b2f8 -r 9195b2bc1e4a external/bsd/wpa/dist/src/drivers/driver_bsd.c
--- a/external/bsd/wpa/dist/src/drivers/driver_bsd.c    Mon Feb 16 08:14:34 2015 +0000
+++ b/external/bsd/wpa/dist/src/drivers/driver_bsd.c    Mon Feb 16 08:25:31 2015 +0000
@@ -828,12 +828,13 @@
 
        return drv;
 bad:
-       if (drv->sock_xmit != NULL)
-               l2_packet_deinit(drv->sock_xmit);
-       if (drv->sock >= 0)
-               close(drv->sock);
-       if (drv != NULL)
+       if (drv != NULL) {
+               if (drv->sock_xmit != NULL)
+                       l2_packet_deinit(drv->sock_xmit);
+               if (drv->sock >= 0)
+                       close(drv->sock);
                os_free(drv);
+       }
        return NULL;
 }
 
@@ -1331,7 +1332,7 @@
        result->freq = sr->isr_freq;
        result->beacon_int = sr->isr_intval;
        result->caps = sr->isr_capinfo;
-       result->qual = sr->isr_rssi;
+       result->level = sr->isr_rssi;
        result->noise = sr->isr_noise;
 
        pos = (u8 *)(result + 1);