[src/trunk]: src/sys/dev/pcmcia Apply OpenBSD rev. 1.40:

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

details:   https://anonhg.NetBSD.org/src/rev/d789ece8bb31
branches:  trunk
changeset: 783132:d789ece8bb31
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Dec 07 05:45:17 2012 +0000

description:
Apply OpenBSD rev. 1.40:
 > Use the actual SSID length rather than a (wrong) sizeof. Makes gcc4
 > -Wbounded happy.
 >
 > ok kettenis

diffstat:

 sys/dev/pcmcia/if_ray.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 9859c4f08f0e -r d789ece8bb31 sys/dev/pcmcia/if_ray.c
--- a/sys/dev/pcmcia/if_ray.c   Fri Dec 07 04:49:08 2012 +0000
+++ b/sys/dev/pcmcia/if_ray.c   Fri Dec 07 05:45:17 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ray.c,v 1.80 2012/10/27 17:18:36 chs Exp $  */
+/*     $NetBSD: if_ray.c,v 1.81 2012/12/07 05:45:17 msaitoh Exp $      */
 
 /*
  * Copyright (c) 2000 Christian E. Hopps
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.80 2012/10/27 17:18:36 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.81 2012/12/07 05:45:17 msaitoh Exp $");
 
 #include "opt_inet.h"
 
@@ -2702,7 +2702,7 @@
                                break;
                }
                sc->sc_cnwid.i_len = i;
-               memcpy(sc->sc_cnwid.i_nwid, np.p_ssid, sizeof(sc->sc_cnwid));
+               memcpy(sc->sc_cnwid.i_nwid, np.p_ssid, i);
                sc->sc_omode = sc->sc_mode;
                if (np.p_net_type != sc->sc_mode)
                        return (ray_start_join_net);