CVS commit: src/sys/dev/pcmcia

[SAITOH Masanobu]

Module Name:    src
Committed By:   msaitoh
Date:           Fri Dec  7 05:45:17 UTC 2012

Modified Files:
        src/sys/dev/pcmcia: if_ray.c

Log Message:
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.80 -r1.81 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.80 src/sys/dev/pcmcia/if_ray.c:1.81
--- src/sys/dev/pcmcia/if_ray.c:1.80	Sat Oct 27 17:18:36 2012
+++ src/sys/dev/pcmcia/if_ray.c	Fri Dec  7 05:45:17 2012
@@ -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 @@ 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);