-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
yaml --- r: 111650 b: refs/heads/master c: 39192c0 h: refs/heads/master v: v3
- Loading branch information
Johannes Berg
authored and
John W. Linville
committed
Sep 11, 2008
1 parent
3973741
commit 8a11a4e
Showing
6 changed files
with
115 additions
and
90 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| --- | ||
| refs/heads/master: de1ede7ac3bd300f9aa565d0f93f6cf9ba74bb1a | ||
| refs/heads/master: 39192c0bcf556c8521dcf0203714e9d48ac0b9f6 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,6 +17,7 @@ mac80211-y := \ | |
| aes_ccm.o \ | ||
| cfg.o \ | ||
| rx.o \ | ||
| spectmgmt.o \ | ||
| tx.o \ | ||
| key.o \ | ||
| util.o \ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| /* | ||
| * spectrum management | ||
| * | ||
| * Copyright 2003, Jouni Malinen <jkmaline@cc.hut.fi> | ||
| * Copyright 2002-2005, Instant802 Networks, Inc. | ||
| * Copyright 2005-2006, Devicescape Software, Inc. | ||
| * Copyright 2006-2007 Jiri Benc <jbenc@suse.cz> | ||
| * Copyright 2007, Michael Wu <flamingice@sourmilk.net> | ||
| * Copyright 2007-2008, Intel Corporation | ||
| * Copyright 2008, Johannes Berg <johannes@sipsolutions.net> | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License version 2 as | ||
| * published by the Free Software Foundation. | ||
| */ | ||
|
|
||
| #include <linux/ieee80211.h> | ||
| #include <net/wireless.h> | ||
| #include <net/mac80211.h> | ||
| #include "ieee80211_i.h" | ||
| #include "sta_info.h" | ||
| #include "wme.h" | ||
|
|
||
| static void ieee80211_send_refuse_measurement_request(struct ieee80211_sub_if_data *sdata, | ||
| struct ieee80211_msrment_ie *request_ie, | ||
| const u8 *da, const u8 *bssid, | ||
| u8 dialog_token) | ||
| { | ||
| struct ieee80211_local *local = sdata->local; | ||
| struct sk_buff *skb; | ||
| struct ieee80211_mgmt *msr_report; | ||
|
|
||
| skb = dev_alloc_skb(sizeof(*msr_report) + local->hw.extra_tx_headroom + | ||
| sizeof(struct ieee80211_msrment_ie)); | ||
|
|
||
| if (!skb) { | ||
| printk(KERN_ERR "%s: failed to allocate buffer for " | ||
| "measurement report frame\n", sdata->dev->name); | ||
| return; | ||
| } | ||
|
|
||
| skb_reserve(skb, local->hw.extra_tx_headroom); | ||
| msr_report = (struct ieee80211_mgmt *)skb_put(skb, 24); | ||
| memset(msr_report, 0, 24); | ||
| memcpy(msr_report->da, da, ETH_ALEN); | ||
| memcpy(msr_report->sa, sdata->dev->dev_addr, ETH_ALEN); | ||
| memcpy(msr_report->bssid, bssid, ETH_ALEN); | ||
| msr_report->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | | ||
| IEEE80211_STYPE_ACTION); | ||
|
|
||
| skb_put(skb, 1 + sizeof(msr_report->u.action.u.measurement)); | ||
| msr_report->u.action.category = WLAN_CATEGORY_SPECTRUM_MGMT; | ||
| msr_report->u.action.u.measurement.action_code = | ||
| WLAN_ACTION_SPCT_MSR_RPRT; | ||
| msr_report->u.action.u.measurement.dialog_token = dialog_token; | ||
|
|
||
| msr_report->u.action.u.measurement.element_id = WLAN_EID_MEASURE_REPORT; | ||
| msr_report->u.action.u.measurement.length = | ||
| sizeof(struct ieee80211_msrment_ie); | ||
|
|
||
| memset(&msr_report->u.action.u.measurement.msr_elem, 0, | ||
| sizeof(struct ieee80211_msrment_ie)); | ||
| msr_report->u.action.u.measurement.msr_elem.token = request_ie->token; | ||
| msr_report->u.action.u.measurement.msr_elem.mode |= | ||
| IEEE80211_SPCT_MSR_RPRT_MODE_REFUSED; | ||
| msr_report->u.action.u.measurement.msr_elem.type = request_ie->type; | ||
|
|
||
| ieee80211_sta_tx(sdata, skb, 0); | ||
| } | ||
|
|
||
| void ieee80211_process_measurement_req(struct ieee80211_sub_if_data *sdata, | ||
| struct ieee80211_mgmt *mgmt, | ||
| size_t len) | ||
| { | ||
| /* | ||
| * Ignoring measurement request is spec violation. | ||
| * Mandatory measurements must be reported optional | ||
| * measurements might be refused or reported incapable | ||
| * For now just refuse | ||
| * TODO: Answer basic measurement as unmeasured | ||
| */ | ||
| ieee80211_send_refuse_measurement_request(sdata, | ||
| &mgmt->u.action.u.measurement.msr_elem, | ||
| mgmt->sa, mgmt->bssid, | ||
| mgmt->u.action.u.measurement.dialog_token); | ||
| } |