From 064da92827be7feab6ee3f736a29952b37539391 Mon Sep 17 00:00:00 2001 From: Peter Huewe Date: Thu, 14 Feb 2013 04:08:55 +0100 Subject: [PATCH] --- yaml --- r: 354496 b: refs/heads/master c: 67a88e6390e52e42b72342a88fab458ada00ba28 h: refs/heads/master v: v3 --- [refs] | 2 +- .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 29 ++++++++++--------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 13db4ef2a061..fffaacef63b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fae7e4d39373305cf505d1f0871a4491897d56f9 +refs/heads/master: 67a88e6390e52e42b72342a88fab458ada00ba28 diff --git a/trunk/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c b/trunk/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c index 45422db81488..60746b8b1eb0 100644 --- a/trunk/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c +++ b/trunk/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c @@ -482,22 +482,23 @@ 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"); - if(ieee->modulation & IEEE80211_CCK_MODULATION){ - strcat(wrqu->name, "b"); - if(ieee->modulation & IEEE80211_OFDM_MODULATION) - strcat(wrqu->name, "/g"); - }else if(ieee->modulation & IEEE80211_OFDM_MODULATION) - strcat(wrqu->name, "g"); - if (ieee->mode & (IEEE_N_24G | IEEE_N_5G)) - strcat(wrqu->name, "/n"); + strlcpy(wrqu->name, "802.11", IFNAMSIZ); + if (ieee->modulation & IEEE80211_CCK_MODULATION) { + strlcat(wrqu->name, "b", IFNAMSIZ); + if (ieee->modulation & IEEE80211_OFDM_MODULATION) + strlcat(wrqu->name, "/g", IFNAMSIZ); + } else if (ieee->modulation & IEEE80211_OFDM_MODULATION) { + strlcat(wrqu->name, "g", IFNAMSIZ); + } - if((ieee->state == IEEE80211_LINKED) || - (ieee->state == IEEE80211_LINKED_SCANNING)) - strcat(wrqu->name," linked"); - else if(ieee->state != IEEE80211_NOLINK) - strcat(wrqu->name," link.."); + if (ieee->mode & (IEEE_N_24G | IEEE_N_5G)) + strlcat(wrqu->name, "/n", IFNAMSIZ); + if ((ieee->state == IEEE80211_LINKED) || + (ieee->state == IEEE80211_LINKED_SCANNING)) + strlcat(wrqu->name, " linked", IFNAMSIZ); + else if (ieee->state != IEEE80211_NOLINK) + strlcat(wrqu->name, " link..", IFNAMSIZ); return 0; }