[src/netbsd-6]: src/sys/dev/pcmcia Pull up following revision(s) (requested b...

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

details:   https://anonhg.NetBSD.org/src/rev/3f32c5bcdbb1
branches:  netbsd-6
changeset: 775581:3f32c5bcdbb1
user:      riz <riz%NetBSD.org@localhost>
date:      Sun Dec 16 18:22:30 2012 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #747):
        sys/dev/pcmcia/if_ray.c: revision 1.81
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 6409c9e14f9a -r 3f32c5bcdbb1 sys/dev/pcmcia/if_ray.c
--- a/sys/dev/pcmcia/if_ray.c   Sun Dec 16 18:19:52 2012 +0000
+++ b/sys/dev/pcmcia/if_ray.c   Sun Dec 16 18:22:30 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ray.c,v 1.79 2010/04/05 07:21:47 joerg Exp $        */
+/*     $NetBSD: if_ray.c,v 1.79.14.1 2012/12/16 18:22:30 riz Exp $     */
 
 /*
  * Copyright (c) 2000 Christian E. Hopps
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.79 2010/04/05 07:21:47 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.79.14.1 2012/12/16 18:22:30 riz Exp $");
 
 #include "opt_inet.h"
 
@@ -2701,7 +2701,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);