diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-23 17:09:17 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-23 17:09:17 -0500 |
| commit | b4de921ae6f7bb211868be4f7d56e80ac6da676c (patch) | |
| tree | d0d740c43519d0e2b290f1499f82e2c03d6520a6 /drivers/net/wireless/libertas | |
| parent | 17a3be341e55b49e4579634281b86f1eb0bad8e8 (diff) | |
| parent | ed4b2019a62e2208a8370461dd91ed4de2c9fc8f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/wireless/libertas')
| -rw-r--r-- | drivers/net/wireless/libertas/wext.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c index a8eb9e1fcf36..4b1aab593a84 100644 --- a/drivers/net/wireless/libertas/wext.c +++ b/drivers/net/wireless/libertas/wext.c | |||
| @@ -2025,10 +2025,8 @@ static int lbs_get_essid(struct net_device *dev, struct iw_request_info *info, | |||
| 2025 | if (priv->connect_status == LBS_CONNECTED) { | 2025 | if (priv->connect_status == LBS_CONNECTED) { |
| 2026 | memcpy(extra, priv->curbssparams.ssid, | 2026 | memcpy(extra, priv->curbssparams.ssid, |
| 2027 | priv->curbssparams.ssid_len); | 2027 | priv->curbssparams.ssid_len); |
| 2028 | extra[priv->curbssparams.ssid_len] = '\0'; | ||
| 2029 | } else { | 2028 | } else { |
| 2030 | memset(extra, 0, 32); | 2029 | memset(extra, 0, 32); |
| 2031 | extra[priv->curbssparams.ssid_len] = '\0'; | ||
| 2032 | } | 2030 | } |
| 2033 | /* | 2031 | /* |
| 2034 | * If none, we may want to get the one that was set | 2032 | * If none, we may want to get the one that was set |