From 10be09ac2ded5e17a31a416b0819f7f8b1afaa8a Mon Sep 17 00:00:00 2001
From: Dan Aloni <dan@aloni.org>
Date: Sat, 20 Jun 2009 16:32:22 +0300
Subject: [PATCH] --- yaml --- r: 155425 b: refs/heads/master c:
 02c8baecf5d8850dba40b47cdf003ed2e04e66dd h: refs/heads/master i:   155423:
 12773e2bf4ff00a6008b3e030e26003655e7dc47 v: v3

---
 [refs]                                               |  2 +-
 .../rtl8187se/ieee80211/ieee80211_softmac_wx.c       | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 6f1126e5d1e0..4cb7d9b308fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77b9288197b6034c44abe2619aff62cba056a713
+refs/heads/master: 02c8baecf5d8850dba40b47cdf003ed2e04e66dd
diff --git a/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c b/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c
index 93af37e2d31a..54b4b718f84a 100644
--- a/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c
+++ b/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c
@@ -461,19 +461,19 @@ int ieee80211_wx_get_name(struct ieee80211_device *ieee,
 			     struct iw_request_info *info,
 			     union iwreq_data *wrqu, char *extra)
 {
-	strcpy(wrqu->name, "802.11");
+	strlcpy(wrqu->name, "802.11", IFNAMSIZ);
 	if(ieee->modulation & IEEE80211_CCK_MODULATION){
-		strcat(wrqu->name, "b");
+		strlcat(wrqu->name, "b", IFNAMSIZ);
 		if(ieee->modulation & IEEE80211_OFDM_MODULATION)
-			strcat(wrqu->name, "/g");
+			strlcat(wrqu->name, "/g", IFNAMSIZ);
 	}else if(ieee->modulation & IEEE80211_OFDM_MODULATION)
-		strcat(wrqu->name, "g");
+		strlcat(wrqu->name, "g", IFNAMSIZ);
 
 	if((ieee->state == IEEE80211_LINKED) ||
 		(ieee->state == IEEE80211_LINKED_SCANNING))
-		strcat(wrqu->name," linked");
+		strlcat(wrqu->name,"  link", IFNAMSIZ);
 	else if(ieee->state != IEEE80211_NOLINK)
-		strcat(wrqu->name," link..");
+		strlcat(wrqu->name," .....", IFNAMSIZ);
 
 
 	return 0;