From c82032a84d0206bb315dfbb951684866a8611764 Mon Sep 17 00:00:00 2001
From: Jean Tourrilhes <jt@hpl.hp.com>
Date: Tue, 10 Oct 2006 14:45:46 -0700
Subject: [PATCH] --- yaml --- r: 40161 b: refs/heads/master c:
 53077944f119808df3d1c6be07241f17a87e7c28 h: refs/heads/master i:   40159:
 8b2ea712927cc73c8e124daef26bcc459800db99 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/net/wireless/airo.c   | 1 -
 trunk/drivers/net/wireless/atmel.c  | 2 --
 trunk/drivers/net/wireless/ray_cs.c | 1 -
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 1690caba309c..a0bd475e0e34 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 683f8c9e00d2aa911382186ca891bd221efaea74
+refs/heads/master: 53077944f119808df3d1c6be07241f17a87e7c28
diff --git a/trunk/drivers/net/wireless/airo.c b/trunk/drivers/net/wireless/airo.c
index 9d5427a6e609..e0710fa9702e 100644
--- a/trunk/drivers/net/wireless/airo.c
+++ b/trunk/drivers/net/wireless/airo.c
@@ -5970,7 +5970,6 @@ static int airo_get_essid(struct net_device *dev,
 
 	/* Get the current SSID */
 	memcpy(extra, status_rid.SSID, status_rid.SSIDlen);
-	extra[status_rid.SSIDlen] = '\0';
 	/* If none, we may want to get the one that was set */
 
 	/* Push it out ! */
diff --git a/trunk/drivers/net/wireless/atmel.c b/trunk/drivers/net/wireless/atmel.c
index 31eed85de60f..0c07b8b7250d 100644
--- a/trunk/drivers/net/wireless/atmel.c
+++ b/trunk/drivers/net/wireless/atmel.c
@@ -1678,11 +1678,9 @@ static int atmel_get_essid(struct net_device *dev,
 	/* Get the current SSID */
 	if (priv->new_SSID_size != 0) {
 		memcpy(extra, priv->new_SSID, priv->new_SSID_size);
-		extra[priv->new_SSID_size] = '\0';
 		dwrq->length = priv->new_SSID_size;
 	} else {
 		memcpy(extra, priv->SSID, priv->SSID_size);
-		extra[priv->SSID_size] = '\0';
 		dwrq->length = priv->SSID_size;
 	}
 
diff --git a/trunk/drivers/net/wireless/ray_cs.c b/trunk/drivers/net/wireless/ray_cs.c
index 0b381d77015c..7fbfc9e41d07 100644
--- a/trunk/drivers/net/wireless/ray_cs.c
+++ b/trunk/drivers/net/wireless/ray_cs.c
@@ -1198,7 +1198,6 @@ static int ray_get_essid(struct net_device *dev,
 
 	/* Get the essid that was set */
 	memcpy(extra, local->sparm.b5.a_current_ess_id, IW_ESSID_MAX_SIZE);
-	extra[IW_ESSID_MAX_SIZE] = '\0';
 
 	/* Push it out ! */
 	dwrq->length = strlen(extra);