CVS commit: [netbsd-6] src/sys/dev/pcmcia

[Jeff Rizzo]

Module Name:    src
Committed By:   riz
Date:           Sun Dec 16 18:22:31 UTC 2012

Modified Files:
        src/sys/dev/pcmcia [netbsd-6]: if_ray.c

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.79.14.1 src/sys/dev/pcmcia/if_ray.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/pcmcia/if_ray.c
diff -u src/sys/dev/pcmcia/if_ray.c:1.79 src/sys/dev/pcmcia/if_ray.c:1.79.14.1
--- src/sys/dev/pcmcia/if_ray.c:1.79	Mon Apr  5 07:21:47 2010
+++ src/sys/dev/pcmcia/if_ray.c	Sun Dec 16 18:22:30 2012
@@ -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 @@ ray_start_join_net_done(struct ray_softc
 				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);