|
Lines 7462-7467
Link Here
|
| 7462 |
return 0; |
7462 |
return 0; |
| 7463 |
} |
7463 |
} |
| 7464 |
|
7464 |
|
|
|
7465 |
#if WIRELESS_EXT > 20 |
| 7466 |
#define IW_ESSID_FIX 0 |
| 7467 |
#else |
| 7468 |
#define IW_ESSID_FIX 1 |
| 7469 |
#endif |
| 7470 |
|
| 7465 |
static int ipw2100_wx_set_essid(struct net_device *dev, |
7471 |
static int ipw2100_wx_set_essid(struct net_device *dev, |
| 7466 |
struct iw_request_info *info, |
7472 |
struct iw_request_info *info, |
| 7467 |
union iwreq_data *wrqu, char *extra) |
7473 |
union iwreq_data *wrqu, char *extra) |
|
Lines 7478-7484
Link Here
|
| 7478 |
} |
7484 |
} |
| 7479 |
|
7485 |
|
| 7480 |
if (wrqu->essid.flags && wrqu->essid.length) { |
7486 |
if (wrqu->essid.flags && wrqu->essid.length) { |
| 7481 |
length = wrqu->essid.length - 1; |
7487 |
length = wrqu->essid.length - IW_ESSID_FIX; |
| 7482 |
essid = extra; |
7488 |
essid = extra; |
| 7483 |
} |
7489 |
} |
| 7484 |
|
7490 |
|
|
Lines 7528-7534
Link Here
|
| 7528 |
IPW_DEBUG_WX("Getting essid: '%s'\n", |
7534 |
IPW_DEBUG_WX("Getting essid: '%s'\n", |
| 7529 |
escape_essid(priv->essid, priv->essid_len)); |
7535 |
escape_essid(priv->essid, priv->essid_len)); |
| 7530 |
memcpy(extra, priv->essid, priv->essid_len); |
7536 |
memcpy(extra, priv->essid, priv->essid_len); |
| 7531 |
wrqu->essid.length = priv->essid_len; |
7537 |
wrqu->essid.length = priv->essid_len + IW_ESSID_FIX; |
| 7532 |
wrqu->essid.flags = 1; /* active */ |
7538 |
wrqu->essid.flags = 1; /* active */ |
| 7533 |
} else { |
7539 |
} else { |
| 7534 |
IPW_DEBUG_WX("Getting essid: ANY\n"); |
7540 |
IPW_DEBUG_WX("Getting essid: ANY\n"); |
|
Lines 7571-7577
Link Here
|
| 7571 |
|
7577 |
|
| 7572 |
struct ipw2100_priv *priv = ieee80211_priv(dev); |
7578 |
struct ipw2100_priv *priv = ieee80211_priv(dev); |
| 7573 |
|
7579 |
|
| 7574 |
wrqu->data.length = strlen(priv->nick) + 1; |
7580 |
wrqu->data.length = strlen(priv->nick) + IW_ESSID_FIX; |
| 7575 |
memcpy(extra, priv->nick, wrqu->data.length); |
7581 |
memcpy(extra, priv->nick, wrqu->data.length); |
| 7576 |
wrqu->data.flags = 1; /* active */ |
7582 |
wrqu->data.flags = 1; /* active */ |
| 7577 |
|
7583 |
|
