From f4ef118e96ad12df1c6333e3e409a76136184371 Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Wed, 21 Nov 2007 11:54:22 -0500 Subject: [PATCH] --- yaml --- r: 78255 b: refs/heads/master c: 88fecd092e2e7677f8e3f5ab32c16d801bc85fd6 h: refs/heads/master i: 78253: 651fa1b063a2069f2f97cb2b062f6189cd12f69b 78251: 41193865d25c9159b1f3c16ea7def3c1eea67c7b 78247: 2882497fa85c8d7487ae14271099daad03c221bc 78239: 6a27dfcee3ca110bb8d538b612cc2da401da92d6 v: v3 --- [refs] | 2 +- trunk/net/mac80211/ieee80211_sta.c | 25 ------------------------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/[refs] b/[refs] index 4ab0672dbbb3..056354a84dd9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64bd4b693f2d0b59673086e9c510068d5ad47cee +refs/heads/master: 88fecd092e2e7677f8e3f5ab32c16d801bc85fd6 diff --git a/trunk/net/mac80211/ieee80211_sta.c b/trunk/net/mac80211/ieee80211_sta.c index 87830c04a1ca..3c552fed2af5 100644 --- a/trunk/net/mac80211/ieee80211_sta.c +++ b/trunk/net/mac80211/ieee80211_sta.c @@ -3260,31 +3260,6 @@ ieee80211_sta_scan_result(struct net_device *dev, } } - do { - char *buf; - - buf = kmalloc(100, GFP_ATOMIC); - if (!buf) - break; - - memset(&iwe, 0, sizeof(iwe)); - iwe.cmd = IWEVCUSTOM; - sprintf(buf, "bcn_int=%d", bss->beacon_int); - iwe.u.data.length = strlen(buf); - current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, - buf); - - memset(&iwe, 0, sizeof(iwe)); - iwe.cmd = IWEVCUSTOM; - sprintf(buf, "capab=0x%04x", bss->capability); - iwe.u.data.length = strlen(buf); - current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, - buf); - - kfree(buf); - break; - } while (0); - return current_ev; }