/spare/repo/netdev-2.6 branch 'ieee80211'

3 files changed, 35 insertions, 9 deletions

diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211_module.c
index e0802b8755a0..553acb2e93d5 100644
--- a/net/ieee80211/ieee80211_module.c
+++ b/net/ieee80211/ieee80211_module.c
@@ -269,5 +269,31 @@ module_exit(ieee80211_exit);
 module_init(ieee80211_init);
 #endif
 
+
+const char *escape_essid(const char *essid, u8 essid_len) {
+        static char escaped[IW_ESSID_MAX_SIZE * 2 + 1];
+        const char *s = essid;
+        char *d = escaped;
+
+        if (ieee80211_is_empty_essid(essid, essid_len)) {
+                memcpy(escaped, "<hidden>", sizeof("<hidden>"));
+                return escaped;
+        }
+
+        essid_len = min(essid_len, (u8)IW_ESSID_MAX_SIZE);
+        while (essid_len--) {
+                if (*s == '\0') {
+                        *d++ = '\\';
+                        *d++ = '0';
+                        s++;
+                } else {
+                        *d++ = *s++;
+                }
+        }
+        *d = '\0';
+        return escaped;
+}
+
 EXPORT_SYMBOL(alloc_ieee80211);
 EXPORT_SYMBOL(free_ieee80211);
+EXPORT_SYMBOL(escape_essid);
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index 0dd102993ef4..9505f3167aeb 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -439,7 +439,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
                               crypt->ops->decrypt_mpdu == NULL))
                         crypt = NULL;
 
-                if (!crypt && (fc & IEEE80211_FCTL_WEP)) {
+                if (!crypt && (fc & IEEE80211_FCTL_PROTECTED)) {
                         /* This seems to be triggered by some (multicast?)
                          * frames from other than current BSS, so just drop the
                          * frames silently instead of filling system log with
@@ -455,7 +455,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
 #ifdef NOT_YET
         if (type != WLAN_FC_TYPE_DATA) {
                 if (type == WLAN_FC_TYPE_MGMT && stype == WLAN_FC_STYPE_AUTH &&
-                    fc & IEEE80211_FCTL_WEP && ieee->host_decrypt &&
+                    fc & IEEE80211_FCTL_PROTECTED && ieee->host_decrypt &&
                     (keyidx = hostap_rx_frame_decrypt(ieee, skb, crypt)) < 0)
                 {
                         printk(KERN_DEBUG "%s: failed to decrypt mgmt::auth "
@@ -556,7 +556,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
 
         /* skb: hdr + (possibly fragmented, possibly encrypted) payload */
 
-        if (ieee->host_decrypt && (fc & IEEE80211_FCTL_WEP) &&
+        if (ieee->host_decrypt && (fc & IEEE80211_FCTL_PROTECTED) &&
             (keyidx = ieee80211_rx_frame_decrypt(ieee, skb, crypt)) < 0)
                 goto rx_dropped;
 
@@ -564,7 +564,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
 
         /* skb: hdr + (possibly fragmented) plaintext payload */
         // PR: FIXME: hostap has additional conditions in the "if" below:
-        // ieee->host_decrypt && (fc & IEEE80211_FCTL_WEP) &&
+        // ieee->host_decrypt && (fc & IEEE80211_FCTL_PROTECTED) &&
         if ((frag != 0 || (fc & IEEE80211_FCTL_MOREFRAGS))) {
                 int flen;
                 struct sk_buff *frag_skb = ieee80211_frag_cache_get(ieee, hdr);
@@ -620,12 +620,12 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
 
         /* skb: hdr + (possible reassembled) full MSDU payload; possibly still
          * encrypted/authenticated */
-        if (ieee->host_decrypt && (fc & IEEE80211_FCTL_WEP) &&
+        if (ieee->host_decrypt && (fc & IEEE80211_FCTL_PROTECTED) &&
             ieee80211_rx_frame_decrypt_msdu(ieee, skb, keyidx, crypt))
                 goto rx_dropped;
 
         hdr = (struct ieee80211_hdr *) skb->data;
-        if (crypt && !(fc & IEEE80211_FCTL_WEP) && !ieee->open_wep) {
+        if (crypt && !(fc & IEEE80211_FCTL_PROTECTED) && !ieee->open_wep) {
                 if (/*ieee->ieee802_1x &&*/
                     ieee80211_is_eapol_frame(ieee, skb)) {
 #ifdef CONFIG_IEEE80211_DEBUG
@@ -646,7 +646,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
         }
 
 #ifdef CONFIG_IEEE80211_DEBUG
-        if (crypt && !(fc & IEEE80211_FCTL_WEP) &&
+        if (crypt && !(fc & IEEE80211_FCTL_PROTECTED) &&
             ieee80211_is_eapol_frame(ieee, skb)) {
                         struct eapol *eap = (struct eapol *)(skb->data +
                                 24);
@@ -655,7 +655,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
         }
 #endif
 
-        if (crypt && !(fc & IEEE80211_FCTL_WEP) && !ieee->open_wep &&
+        if (crypt && !(fc & IEEE80211_FCTL_PROTECTED) && !ieee->open_wep &&
             !ieee80211_is_eapol_frame(ieee, skb)) {
                 IEEE80211_DEBUG_DROP(
                         "dropped unencrypted RX data "
diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c
index d1049edcd14d..071d093f2989 100644
--- a/net/ieee80211/ieee80211_tx.c
+++ b/net/ieee80211/ieee80211_tx.c
@@ -313,7 +313,7 @@ int ieee80211_xmit(struct sk_buff *skb,
 
         if (encrypt)
                 fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA |
-                        IEEE80211_FCTL_WEP;
+                        IEEE80211_FCTL_PROTECTED;
         else
                 fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA;