summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2010-05-19 18:50:03 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2010-05-19 18:50:03 +0000
commit236826abfd36cd93d45934ce1602542fff387e4c (patch)
tree099cf6217841b00d5118dd0c771abce2ceccaa95
parentf982b5610e37d47c7c9cd160218566bd78adaeac (diff)
Use the actual SSID length rather than a (wrong) sizeof. Makes gcc4
-Wbounded happy. ok kettenis
-rw-r--r--sys/dev/pcmcia/if_ray.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pcmcia/if_ray.c b/sys/dev/pcmcia/if_ray.c
index 79315d493ba..ee2d67fb77b 100644
--- a/sys/dev/pcmcia/if_ray.c
+++ b/sys/dev/pcmcia/if_ray.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ray.c,v 1.39 2009/10/13 19:33:16 pirofti Exp $ */
+/* $OpenBSD: if_ray.c,v 1.40 2010/05/19 18:50:02 nicm Exp $ */
/* $NetBSD: if_ray.c,v 1.21 2000/07/05 02:35:54 onoe Exp $ */
/*
@@ -2762,7 +2762,7 @@ ray_start_join_net_done(struct ray_softc *sc, u_int cmd, bus_size_t ccs, u_int s
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);