* Re: [PATCH v2] hwsim tests: use argparse module
From: Johannes Berg @ 2013-10-30 16:27 UTC (permalink / raw)
To: linux-wireless; +Cc: j
In-Reply-To: <1383150313-4155-1-git-send-email-johannes@sipsolutions.net>
Err, this went to the wrong list, sorry.
johannes
^ permalink raw reply
* Re: [PATCH/RFT 00/12] ath10k: pci fixes 2013-10-30
From: Ben Greear @ 2013-10-30 17:06 UTC (permalink / raw)
To: Michal Kazior; +Cc: ath10k, linux-wireless
In-Reply-To: <1383133346-8135-1-git-send-email-michal.kazior@tieto.com>
On 10/30/2013 04:42 AM, Michal Kazior wrote:
> Hi,
>
> This patchset contains a slew of PCI/CE cleanups
> and fixes. The aim of the patchset is to deal with
> CE null dereference bugs Ben has been reporting on
> the mailing list for some time now.
>
> I've done some brief testing and don't see any
> major regressions. I wasn't able to reproduce the
> reported bugs though. @Ben: Could you perhaps test
> this, please?
I'll test these later today, thanks!
Ben
--
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc http://www.candelatech.com
^ permalink raw reply
* [PATCH] nl80211: better document NL80211_CMD_TDLS_MGMT
From: Arik Nemtsov @ 2013-10-30 17:09 UTC (permalink / raw)
To: linux-wireless; +Cc: Johannes Berg, Arik Nemtsov
This command has different semantics depending on the action code sent.
Document this fact and detail the supported action codes.
Signed-off-by: Arik Nemtsov <arik@wizery.com>
---
include/uapi/linux/nl80211.h | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index f752e98..877c048 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -581,7 +581,14 @@
* operation, %NL80211_ATTR_MAC contains the peer MAC address, and
* %NL80211_ATTR_REASON_CODE the reason code to be used (only with
* %NL80211_TDLS_TEARDOWN).
- * @NL80211_CMD_TDLS_MGMT: Send a TDLS management frame.
+ * @NL80211_CMD_TDLS_MGMT: Send a TDLS management frame. The
+ * %NL80211_ATTR_TDLS_ACTION attribute determines the typ of frame to be
+ * sent. Public Action codes (802.11-2012 8.1.5.1) will be sent as
+ * 802.11 management frames, while TDLS action codes (802.11-2012
+ * 8.5.13.1) will be encapsulated and sent as data frames. The currently
+ * supported Public Action code is %WLAN_PUB_ACTION_TDLS_DISCOVER_RES
+ * and the currently supported TDLS actions codes are given in
+ * &enum ieee80211_tdls_actioncode.
*
* @NL80211_CMD_UNEXPECTED_FRAME: Used by an application controlling an AP
* (or GO) interface (i.e. hostapd) to ask for unexpected frames to
--
1.8.1.2
^ permalink raw reply related
* [patch v2] libertas: potential oops in debugfs
From: Dan Carpenter @ 2013-10-30 17:12 UTC (permalink / raw)
To: John W. Linville
Cc: libertas-dev, linux-wireless, netdev, linux-kernel,
kernel-janitors
In-Reply-To: <20131025144452.GA28451@ngolde.de>
If we do a zero size allocation then it will oops. Also we can't be
sure the user passes us a NUL terminated string so I've added a
terminator.
This code can only be triggered by root.
Reported-by: Nico Golde <nico@ngolde.de>
Reported-by: Fabian Yamaguchi <fabs@goesec.de>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
index 668dd27..1917348 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -913,7 +913,10 @@ static ssize_t lbs_debugfs_write(struct file *f, const char __user *buf,
char *p2;
struct debug_data *d = f->private_data;
- pdata = kmalloc(cnt, GFP_KERNEL);
+ if (cnt == 0)
+ return 0;
+
+ pdata = kmalloc(cnt + 1, GFP_KERNEL);
if (pdata == NULL)
return 0;
@@ -922,6 +925,7 @@ static ssize_t lbs_debugfs_write(struct file *f, const char __user *buf,
kfree(pdata);
return 0;
}
+ pdata[cnt] = '\0';
p0 = pdata;
for (i = 0; i < num_of_items; i++) {
^ permalink raw reply related
* Re: [PATCH/RFT 12/12] ath10k: add some debug prints
From: Joe Perches @ 2013-10-30 17:16 UTC (permalink / raw)
To: Michal Kazior; +Cc: ath10k, linux-wireless, greearb
In-Reply-To: <1383133346-8135-13-git-send-email-michal.kazior@tieto.com>
On Wed, 2013-10-30 at 12:42 +0100, Michal Kazior wrote:
> Some errors were handled too silently.
These aren't really debug prints.
> diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
[]
> @@ -1860,8 +1862,10 @@ static int ath10k_pci_hif_power_up(struct ath10k *ar)
> ath10k_do_pci_wake(ar);
>
> ret = ath10k_pci_ce_init(ar);
> - if (ret)
> + if (ret) {
> + ath10k_err("could not initialize CE (%d)\n", ret);
Rather than try to reinterpret the function name,
perhaps it's better to simply emit the function name
as is done most other places like:
ath10k_err("ath10k_pci_ce_init failed: (%d)\n", ret);
> @@ -1876,16 +1880,22 @@ static int ath10k_pci_hif_power_up(struct ath10k *ar)
> }
>
> ret = ath10k_pci_wait_for_target_init(ar);
> - if (ret)
> + if (ret) {
> + ath10k_err("failed to wait for target to init (%d)\n", ret);
> goto err_irq;
> + }
Like this one, because the function did wait,
but the init was unsuccessful.
^ permalink raw reply
* pull-request: iwlwifi-next 2013-10-07
From: Emmanuel Grumbach @ 2013-10-30 17:36 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless
[-- Attachment #1: Type: text/plain, Size: 2221 bytes --]
John,
This the last pull request before merge window opens.
There are a few fixes from Johannes mostly clean up patches. We have
also a few other fixes that are relevant for the new firmware that has
not been released yet.
Tell me about any issues you might face with it. Thanks.
emmanuel
The following changes since commit 246dd9922e859768aa522daa6c1c601785e57e0c:
iwlwifi: mvm: fix operator precedence (2013-10-18 16:02:38 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git
for-john
for you to fetch changes up to c92f06a1dea1e444213d860a20023f72c134e20a:
iwlwifi: mvm: BT Coex - fix copy paste issue (2013-10-30 19:20:48 +0200)
----------------------------------------------------------------
Alexander Bondar (1):
iwlwifi: mvm: update UAPSD support TLV bits
Emmanuel Grumbach (2):
iwlwifi: mvm: BT Coex fix NULL pointer dereference
iwlwifi: mvm: BT Coex - fix copy paste issue
Johannes Berg (5):
iwlwifi: transport config n_no_reclaim_cmds should be unsigned
iwlwifi: pcie: move warning message into warning
iwlwifi: mvm: capture the FCS in monitor mode
iwlwifi: mvm: add missing break in debugfs
iwlwifi: warn if firmware image doesn't exist
Michael Opdenacker (1):
iwlwifi: remove duplicate includes
drivers/net/wireless/iwlwifi/dvm/ucode.c | 9 ++++-----
drivers/net/wireless/iwlwifi/iwl-fw.h | 3 ++-
drivers/net/wireless/iwlwifi/iwl-io.c | 1 -
drivers/net/wireless/iwlwifi/iwl-trans.h | 2 +-
drivers/net/wireless/iwlwifi/mvm/bt-coex.c | 8 ++++++--
drivers/net/wireless/iwlwifi/mvm/debugfs.c | 1 +
drivers/net/wireless/iwlwifi/mvm/fw.c | 8 +++-----
drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 8 +++++++-
drivers/net/wireless/iwlwifi/mvm/mac80211.c | 14 +++++++++-----
drivers/net/wireless/iwlwifi/mvm/mvm.h | 1 -
drivers/net/wireless/iwlwifi/mvm/ops.c | 2 +-
drivers/net/wireless/iwlwifi/mvm/rx.c | 6 +++++-
drivers/net/wireless/iwlwifi/pcie/tx.c | 9 ++++-----
13 files changed, 43 insertions(+), 29 deletions(-)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: pull-request: iwlwifi-next 2013-10-07
From: Johannes Berg @ 2013-10-30 17:43 UTC (permalink / raw)
To: Emmanuel Grumbach; +Cc: John Linville, linux-wireless
In-Reply-To: <527143AA.5070900@gmail.com>
And yes, I support that - Emmanuel is taking over the tree from me :-)
johannes
^ permalink raw reply
* Re: [PATCH] nl80211: better document NL80211_CMD_TDLS_MGMT
From: Bob Copeland @ 2013-10-30 18:43 UTC (permalink / raw)
To: Arik Nemtsov; +Cc: linux-wireless, Johannes Berg
In-Reply-To: <1383152974-13097-1-git-send-email-arik@wizery.com>
On Wed, Oct 30, 2013 at 07:09:34PM +0200, Arik Nemtsov wrote:
> + * @NL80211_CMD_TDLS_MGMT: Send a TDLS management frame. The
> + * %NL80211_ATTR_TDLS_ACTION attribute determines the typ of frame to be
type typo there.
> + * sent. Public Action codes (802.11-2012 8.1.5.1) will be sent as
> + * 802.11 management frames, while TDLS action codes (802.11-2012
--
Bob Copeland %% www.bobcopeland.com
^ permalink raw reply
* AP mode with hostapd
From: Drasko DRASKOVIC @ 2013-10-30 19:05 UTC (permalink / raw)
To: ath6kl-devel, linux-wireless
HI all,
I have AR6004 USB dongle connected to Linux kernel 3.10, and am
testing latest hostapd.
I noticed that I was able to put the dongle in the AP mode only for
not-n mode (a or g).
Enabling both of these options:
hw_mode=g
ieee80211n=1
gives an error like this on starting:
random: Trying to read entropy from /dev/random
Configuration file: /home/drasko/hostapd.conf
HT (IEEE 802.11n) with WPA/WPA2 requires CCMP/GCMP to be enabled,
disabling HT capabilities
rfkill: initial event: idx=0 type=1 op=0 soft=0 hard=0
rfkill: initial event: idx=1 type=1 op=0 soft=0 hard=0
rfkill: initial event: idx=2 type=2 op=0 soft=0 hard=0
rfkill: initial event: idx=5 type=1 op=0 soft=0 hard=0
nl80211: Using driver-based roaming
nl80211: Supports Probe Response offload in AP mode
nl80211: Disable use_monitor with device_ap_sme since no monitor mode
support detected
nl80211: interface wlan3 in phy phy3
nl80211: Add own interface ifindex 6
nl80211: Set mode ifindex 6 iftype 3 (AP)
nl80211: Setup AP - device_ap_sme=1 use_monitor=0
nl80211: Subscribe to mgmt frames with AP handle 0x1441480 (device SME)
nl80211: Register frame type=0xd0 nl_handle=0x1441480
nl80211: Register frame match - hexdump(len=0): [NULL]
nl80211: Enable Probe Request reporting nl_preq=0x14414c0
nl80211: Register frame type=0x40 nl_handle=0x14414c0
nl80211: Register frame match - hexdump(len=0): [NULL]
BSS count 1, BSSID mask 00:00:00:00:00:00 (0 bits)
nl80211: Regulatory information - country=FR
nl80211: 2402-2482 @ 40 MHz
nl80211: 2402-2482 @ 20 mBm
nl80211: 5170-5250 @ 40 MHz
nl80211: 5170-5250 @ 20 mBm
nl80211: 5250-5330 @ 40 MHz
nl80211: 5250-5330 @ 20 mBm
nl80211: 5490-5710 @ 40 MHz
nl80211: 5490-5710 @ 27 mBm
nl80211: 57240-65880 @ 2160 MHz
nl80211: 57240-65880 @ 40 mBm
nl80211: Added 802.11b mode based on 802.11g information
Completing interface initialization
Mode: IEEE 802.11g Channel: 7 Frequency: 2442 MHz
DFS 0 channels required radar detection
nl80211: Set freq 2442 (ht_enabled=1, vht_enabled=0, bandwidth=20 MHz,
cf1=2442 MHz, cf2=0 MHz)
nl80211: Failed to set channel (freq=2442): -22 (Invalid argument)
Could not set channel for kernel driver
wlan3: Unable to setup interface.
wlan3: Flushing old station entries
nl80211: flush -> DEL_STATION wlan3 (all)
wlan3: Deauthenticate all stations
nl80211: sta_remove -> DEL_STATION wlan3 ff:ff:ff:ff:ff:ff --> 0 (Success)
wpa_driver_nl80211_set_key: ifindex=6 (wlan3) alg=0 addr=(nil)
key_idx=0 set_tx=0 seq_len=0 key_len=0
wpa_driver_nl80211_set_key: ifindex=6 (wlan3) alg=0 addr=(nil)
key_idx=1 set_tx=0 seq_len=0 key_len=0
wpa_driver_nl80211_set_key: ifindex=6 (wlan3) alg=0 addr=(nil)
key_idx=2 set_tx=0 seq_len=0 key_len=0
wpa_driver_nl80211_set_key: ifindex=6 (wlan3) alg=0 addr=(nil)
key_idx=3 set_tx=0 seq_len=0 key_len=0
nl80211: Skip disabling of Probe Request reporting
nl_preq=0x8888888889cc9c49 while in AP mode
netlink: Operstate: linkmode=0, operstate=6
nl80211: Set mode ifindex 6 iftype 2 (STATION)
nl80211: Disable Probe Request reporting nl_preq=0x8888888889cc9c49
nl80211: Unsubscribe mgmt frames handle 0x8888888889cc9c09 (AP
teardown (dev SME))
Failed to initialize interface
I have tried several channels - all were rejected with the same message.
Any idea where these error messages come from?
Best regards,
Drasko
^ permalink raw reply
* pull request: bluetooth 2013-10-30
From: Gustavo Padovan @ 2013-10-30 19:38 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, linux-bluetooth, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 964 bytes --]
Hi John,
A last fix to the 3.12. I ended forgetting to send it before, I hope we can
still make the way to 3.12. It is a revert and it fixes an issue with bluetooth
suspend/hibernate that had many bug reports. Please pull or let me know of any
problems. Thanks!
Gustavo
--
The following changes since commit c7515d2365a6b8a018950198ebe1f5be793cd4bb:
brcmsmac: call bcma_core_pci_power_save() from non-atomic context (2013-09-26 14:02:34 -0400)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth master
for you to fetch changes up to b1a8014471b01dd862de9f91bbbff1296afac42d:
Bluetooth: revert: "Bluetooth: Add missing reset_resume dev_pm_ops" (2013-10-02 16:01:49 -0300)
----------------------------------------------------------------
Hans de Goede (1):
Bluetooth: revert: "Bluetooth: Add missing reset_resume dev_pm_ops"
drivers/bluetooth/btusb.c | 1 -
1 file changed, 1 deletion(-)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [patch v2] libertas: potential oops in debugfs
From: Dan Williams @ 2013-10-30 19:51 UTC (permalink / raw)
To: Dan Carpenter
Cc: John W. Linville, libertas-dev, linux-wireless, netdev,
linux-kernel, kernel-janitors
In-Reply-To: <20131030171251.GA4130@longonot.mountain>
On Wed, 2013-10-30 at 20:12 +0300, Dan Carpenter wrote:
> If we do a zero size allocation then it will oops. Also we can't be
> sure the user passes us a NUL terminated string so I've added a
> terminator.
>
> This code can only be triggered by root.
>
> Reported-by: Nico Golde <nico@ngolde.de>
> Reported-by: Fabian Yamaguchi <fabs@goesec.de>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Dan Williams <dcbw@redhat.com>
>
> diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
> index 668dd27..1917348 100644
> --- a/drivers/net/wireless/libertas/debugfs.c
> +++ b/drivers/net/wireless/libertas/debugfs.c
> @@ -913,7 +913,10 @@ static ssize_t lbs_debugfs_write(struct file *f, const char __user *buf,
> char *p2;
> struct debug_data *d = f->private_data;
>
> - pdata = kmalloc(cnt, GFP_KERNEL);
> + if (cnt == 0)
> + return 0;
> +
> + pdata = kmalloc(cnt + 1, GFP_KERNEL);
> if (pdata == NULL)
> return 0;
>
> @@ -922,6 +925,7 @@ static ssize_t lbs_debugfs_write(struct file *f, const char __user *buf,
> kfree(pdata);
> return 0;
> }
> + pdata[cnt] = '\0';
>
> p0 = pdata;
> for (i = 0; i < num_of_items; i++) {
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* [PATCH 1/9] iwlwifi: mvm: update UAPSD support TLV bits
From: Emmanuel Grumbach @ 2013-10-30 20:31 UTC (permalink / raw)
To: John Linville
Cc: linux-wireless, Alexander Bondar, David Spinadel,
Emmanuel Grumbach
In-Reply-To: <527143AA.5070900@gmail.com>
From: Alexander Bondar <alexander.bondar@intel.com>
Change old UAPSD bit to PM_CMD_SUPPORT, and add a new bit to indicate
real UAPSD support.
Don't use UAPSD when the firmware doesn't support it.
Signed-off-by: David Spinadel <david.spinadel@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/iwl-fw.h | 3 ++-
drivers/net/wireless/iwlwifi/mvm/mac80211.c | 14 +++++++++-----
drivers/net/wireless/iwlwifi/mvm/ops.c | 2 +-
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-fw.h b/drivers/net/wireless/iwlwifi/iwl-fw.h
index 87b66a8..75db0871 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fw.h
@@ -100,7 +100,7 @@ enum iwl_ucode_tlv_flag {
IWL_UCODE_TLV_FLAGS_P2P = BIT(3),
IWL_UCODE_TLV_FLAGS_DW_BC_TABLE = BIT(4),
IWL_UCODE_TLV_FLAGS_NEWBT_COEX = BIT(5),
- IWL_UCODE_TLV_FLAGS_UAPSD = BIT(6),
+ IWL_UCODE_TLV_FLAGS_PM_CMD_SUPPORT = BIT(6),
IWL_UCODE_TLV_FLAGS_SHORT_BL = BIT(7),
IWL_UCODE_TLV_FLAGS_RX_ENERGY_API = BIT(8),
IWL_UCODE_TLV_FLAGS_TIME_EVENT_API_V2 = BIT(9),
@@ -113,6 +113,7 @@ enum iwl_ucode_tlv_flag {
IWL_UCODE_TLV_FLAGS_SCHED_SCAN = BIT(17),
IWL_UCODE_TLV_FLAGS_STA_KEY_CMD = BIT(19),
IWL_UCODE_TLV_FLAGS_DEVICE_PS_CMD = BIT(20),
+ IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT = BIT(24),
};
/* The default calibrate table size if not specified by firmware file */
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index f40685c..74bc2c8 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -164,8 +164,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
IEEE80211_HW_TIMING_BEACON_ONLY |
IEEE80211_HW_CONNECTION_MONITOR |
IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |
- IEEE80211_HW_SUPPORTS_STATIC_SMPS |
- IEEE80211_HW_SUPPORTS_UAPSD;
+ IEEE80211_HW_SUPPORTS_STATIC_SMPS;
hw->queues = mvm->first_agg_queue;
hw->offchannel_tx_hw_queue = IWL_MVM_OFFCHANNEL_QUEUE;
@@ -180,6 +179,12 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
!iwlwifi_mod_params.sw_crypto)
hw->flags |= IEEE80211_HW_MFP_CAPABLE;
+ if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT) {
+ hw->flags |= IEEE80211_HW_SUPPORTS_UAPSD;
+ hw->uapsd_queues = IWL_UAPSD_AC_INFO;
+ hw->uapsd_max_sp_len = IWL_UAPSD_MAX_SP;
+ }
+
hw->sta_data_size = sizeof(struct iwl_mvm_sta);
hw->vif_data_size = sizeof(struct iwl_mvm_vif);
hw->chanctx_data_size = sizeof(u16);
@@ -204,8 +209,6 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
hw->wiphy->max_remain_on_channel_duration = 10000;
hw->max_listen_interval = IWL_CONN_MAX_LISTEN_INTERVAL;
- hw->uapsd_queues = IWL_UAPSD_AC_INFO;
- hw->uapsd_max_sp_len = IWL_UAPSD_MAX_SP;
/* Extract MAC address */
memcpy(mvm->addresses[0].addr, mvm->nvm_data->hw_addr, ETH_ALEN);
@@ -861,7 +864,8 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm,
/* reset rssi values */
mvmvif->bf_data.ave_beacon_signal = 0;
- if (!(mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_UAPSD)) {
+ if (!(mvm->fw->ucode_capa.flags &
+ IWL_UCODE_TLV_FLAGS_PM_CMD_SUPPORT)) {
/* Workaround for FW bug, otherwise FW disables device
* power save upon disassociation
*/
diff --git a/drivers/net/wireless/iwlwifi/mvm/ops.c b/drivers/net/wireless/iwlwifi/mvm/ops.c
index 59b7cb3..d86083c 100644
--- a/drivers/net/wireless/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/iwlwifi/mvm/ops.c
@@ -459,7 +459,7 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
if (err)
goto out_unregister;
- if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_UAPSD)
+ if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_PM_CMD_SUPPORT)
mvm->pm_ops = &pm_mac_ops;
else
mvm->pm_ops = &pm_legacy_ops;
--
1.8.3.2
^ permalink raw reply related
* [PATCH 2/9] iwlwifi: transport config n_no_reclaim_cmds should be unsigned
From: Emmanuel Grumbach @ 2013-10-30 20:31 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless, Johannes Berg, Emmanuel Grumbach
In-Reply-To: <1383165097-4445-1-git-send-email-emmanuel.grumbach@intel.com>
From: Johannes Berg <johannes.berg@intel.com>
The number of commands can never be negative, so it should
be using an unsigned type. This also shuts up an smatch
warning elsewhere in the code.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/iwl-trans.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h
index dd57a36..2dc64b5 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans.h
@@ -344,7 +344,7 @@ struct iwl_trans_config {
u8 cmd_queue;
u8 cmd_fifo;
const u8 *no_reclaim_cmds;
- int n_no_reclaim_cmds;
+ unsigned int n_no_reclaim_cmds;
bool rx_buf_size_8k;
bool bc_table_dword;
--
1.8.3.2
^ permalink raw reply related
* [PATCH 3/9] iwlwifi: mvm: BT Coex fix NULL pointer dereference
From: Emmanuel Grumbach @ 2013-10-30 20:31 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless, Emmanuel Grumbach
In-Reply-To: <1383165097-4445-1-git-send-email-emmanuel.grumbach@intel.com>
When we disassociate, mac80211 removes the station and
then, it sets the bss it unsets the assoc bool in bss_info.
Since the firwmware wants it the opposite (first set the
MAC context as unassoc, and only then, remove the STA of
the API), we have a small period of time in which the STA
in firmware doesn't have a valid ieee80211_sta pointer.
During that time, iwl_mvm_vif->ap_sta_id, is still set
to the STA in firmware that represent the AP.
This avoids:
[ 4481.476246] BUG: unable to handle kernel NULL pointer dereference at 00000045
[ 4481.479521] IP: [<f8416a6a>] iwl_mvm_bt_coex_reduced_txp+0x7a/0x190 [iwlmvm]
[ 4481.482023] *pde = 00000000
[ 4481.484332] Oops: 0000 [#1] SMP DEBUG_PAGEALLOC
[ 4481.486897] Modules linked in: netconsole configfs autofs4 rfcomm(O) bnep(O) nfsd nfs_acl auth_rpcgss exportfs nfs lockd binfmt_misc sunrpc fscache arc4 iwlmvm(O) mac80211(O) btusb(O) iwlwifi(O) bluetooth(O) cfg80211(O) snd_hda_codec_hdmi coretemp dell_wmi snd_hda_codec_idt compat(O) dell_laptop aesni_intel i915 sparse_keymap dcdbas cryptd psmouse serio_raw aes_i586 microcode snd_hda_intel drm_kms_helper snd_hda_codec drm snd_pcm snd_timer i2c_algo_bit video intel_agp intel_gtt snd soundcore snd_page_alloc crc32c_intel ahci sdhci_pci libahci sdhci mmc_core e1000e xhci_hcd [last unloaded: configfs]
[ 4481.502983]
[ 4481.505599] Pid: 6507, comm: kworker/0:1 Tainted: G O 3.4.43-dev #1 Dell Inc. Latitude E6430/0CMDYV
[ 4481.508575] EIP: 0060:[<f8416a6a>] EFLAGS: 00010246 CPU: 0
[ 4481.511248] EIP is at iwl_mvm_bt_coex_reduced_txp+0x7a/0x190 [iwlmvm]
[ 4481.513947] EAX: ffffffea EBX: 00000002 ECX: 00000001 EDX: 00000001
[ 4481.516710] ESI: ec6f0f28 EDI: 00000000 EBP: e8175dfc ESP: e8175d9c
[ 4481.519445] DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
[ 4481.522185] CR0: 8005003b CR2: 00000045 CR3: 01a5e000 CR4: 001407d0
[ 4481.524950] DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000
[ 4481.527768] DR6: ffff0ff0 DR7: 00000400
[ 4481.530565] Process kworker/0:1 (pid: 6507, ti=e8174000 task=e8032b20 task.ti=e8174000)
[ 4481.533447] Stack:
[ 4481.536379] e472439f 00003a12 e8032b20 e8033048 00000001 e8175ddc 00000246 e8033040
[ 4481.540132] 00000002 01814990 ec4d1ddc e8175dcc 00000000 00000000 00000000 00000000
[ 4481.543867] 00000000 00000000 00000001 000001c8 009b0002 ec4d1ddc ec6f0f28 00000000
[ 4481.547633] Call Trace:
[ 4481.550578] [<f8418027>] iwl_mvm_bt_rssi_event+0x197/0x220 [iwlmvm]
[ 4481.553537] [<f840919c>] iwl_mvm_stat_iterator+0xdc/0x240 [iwlmvm]
[ 4481.556582] [<f8d129c2>] __iterate_active_interfaces+0xe2/0x1f0 [mac80211]
[ 4481.559544] [<f84090c0>] ? iwl_mvm_update_smps+0x90/0x90 [iwlmvm]
[ 4481.562519] [<f84090c0>] ? iwl_mvm_update_smps+0x90/0x90 [iwlmvm]
[ 4481.565498] [<f8d12b0c>] ieee80211_iterate_active_interfaces+0x3c/0x50 [mac80211]
[ 4481.568421] [<f8409b43>] iwl_mvm_rx_statistics+0xb3/0x130 [iwlmvm]
[ 4481.571349] [<f8405431>] iwl_mvm_async_handlers_wk+0xc1/0xf0 [iwlmvm]
[ 4481.574251] [<c1052915>] ? process_one_work+0x105/0x5c0
[ 4481.577162] [<c1052991>] process_one_work+0x181/0x5c0
[ 4481.580025] [<c1052915>] ? process_one_work+0x105/0x5c0
[ 4481.582861] [<f8405370>] ? iwl_mvm_rx_fw_logs+0x20/0x20 [iwlmvm]
[ 4481.585722] [<c10530f1>] worker_thread+0x121/0x2c0
[ 4481.588536] [<c1052fd0>] ? rescuer_thread+0x1d0/0x1d0
[ 4481.591323] [<c105af0d>] kthread+0x7d/0x90
[ 4481.594059] [<c105ae90>] ? flush_kthread_worker+0x120/0x120
[ 4481.596868] [<c15b7cc2>] kernel_thread_helper+0x6/0x10
[ 4481.599605] Code: 9d de c3 c8 85 c0 74 0d 80 3d f8 ae 42 f8 00 0f 84 dc 00 00 00 8b 45 c8 0f b6 d3 31 ff 89 55 c0 8b 84 90 d8 03 00 00 0f b6 55 c7 <38> 50 5b 89 45 bc 0f 84 a8 00 00 00 a1 e4 d2 04 c2 85 c0 0f 84
[ 4481.611782] EIP: [<f8416a6a>] iwl_mvm_bt_coex_reduced_txp+0x7a/0x190 [iwlmvm] SS:ESP 0068:e8175d9c
[ 4481.614985] CR2: 0000000000000045
[ 4481.687441] ---[ end trace b11bc915fbac4412 ]---
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/mvm/bt-coex.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/iwlwifi/mvm/bt-coex.c b/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
index 5b630f12b..7444b2a 100644
--- a/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
+++ b/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
@@ -505,12 +505,16 @@ static int iwl_mvm_bt_coex_reduced_txp(struct iwl_mvm *mvm, u8 sta_id,
struct iwl_mvm_sta *mvmsta;
int ret;
- /* This can happen if the station has been removed right now */
if (sta_id == IWL_MVM_STATION_COUNT)
return 0;
sta = rcu_dereference_protected(mvm->fw_id_to_mac_id[sta_id],
lockdep_is_held(&mvm->mutex));
+
+ /* This can happen if the station has been removed right now */
+ if (IS_ERR_OR_NULL(sta))
+ return 0;
+
mvmsta = (void *)sta->drv_priv;
/* nothing to do */
--
1.8.3.2
^ permalink raw reply related
* [PATCH 4/9] iwlwifi: pcie: move warning message into warning
From: Emmanuel Grumbach @ 2013-10-30 20:31 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless, Johannes Berg, Emmanuel Grumbach
In-Reply-To: <1383165097-4445-1-git-send-email-emmanuel.grumbach@intel.com>
From: Johannes Berg <johannes.berg@intel.com>
Having a WARN_ON() followed by a printed message is
less useful than having the message in the warning
so move the message.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/pcie/tx.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/pcie/tx.c b/drivers/net/wireless/iwlwifi/pcie/tx.c
index b416841..cc18440 100644
--- a/drivers/net/wireless/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/tx.c
@@ -1495,12 +1495,11 @@ static int iwl_pcie_send_hcmd_sync(struct iwl_trans *trans,
IWL_DEBUG_INFO(trans, "Attempting to send sync command %s\n",
get_cmd_string(trans_pcie, cmd->id));
- if (WARN_ON(test_and_set_bit(STATUS_HCMD_ACTIVE,
- &trans_pcie->status))) {
- IWL_ERR(trans, "Command %s: a command is already active!\n",
- get_cmd_string(trans_pcie, cmd->id));
+ if (WARN(test_and_set_bit(STATUS_HCMD_ACTIVE,
+ &trans_pcie->status),
+ "Command %s: a command is already active!\n",
+ get_cmd_string(trans_pcie, cmd->id)))
return -EIO;
- }
IWL_DEBUG_INFO(trans, "Setting HCMD_ACTIVE for command %s\n",
get_cmd_string(trans_pcie, cmd->id));
--
1.8.3.2
^ permalink raw reply related
* [PATCH 5/9] iwlwifi: mvm: capture the FCS in monitor mode
From: Emmanuel Grumbach @ 2013-10-30 20:31 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless, Johannes Berg, Emmanuel Grumbach
In-Reply-To: <1383165097-4445-1-git-send-email-emmanuel.grumbach@intel.com>
From: Johannes Berg <johannes.berg@intel.com>
This can be useful when using the device as a sniffer.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 8 +++++++-
drivers/net/wireless/iwlwifi/mvm/rx.c | 6 +++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
index ab5a7ac..f41f9b0 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
@@ -719,7 +719,9 @@ static int iwl_mvm_mac_ctxt_cmd_listener(struct iwl_mvm *mvm,
cmd.filter_flags = cpu_to_le32(MAC_FILTER_IN_PROMISC |
MAC_FILTER_IN_CONTROL_AND_MGMT |
MAC_FILTER_IN_BEACON |
- MAC_FILTER_IN_PROBE_REQUEST);
+ MAC_FILTER_IN_PROBE_REQUEST |
+ MAC_FILTER_IN_CRC32);
+ mvm->hw->flags |= IEEE80211_HW_RX_INCLUDES_FCS;
return iwl_mvm_mac_ctxt_send_cmd(mvm, &cmd);
}
@@ -1122,6 +1124,10 @@ int iwl_mvm_mac_ctxt_remove(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
}
mvmvif->uploaded = false;
+
+ if (vif->type == NL80211_IFTYPE_MONITOR)
+ mvm->hw->flags &= ~IEEE80211_HW_RX_INCLUDES_FCS;
+
return 0;
}
diff --git a/drivers/net/wireless/iwlwifi/mvm/rx.c b/drivers/net/wireless/iwlwifi/mvm/rx.c
index a4af501..3a1f398 100644
--- a/drivers/net/wireless/iwlwifi/mvm/rx.c
+++ b/drivers/net/wireless/iwlwifi/mvm/rx.c
@@ -300,10 +300,14 @@ int iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,
return 0;
}
+ /*
+ * Keep packets with CRC errors (and with overrun) for monitor mode
+ * (otherwise the firmware discards them) but mark them as bad.
+ */
if (!(rx_pkt_status & RX_MPDU_RES_STATUS_CRC_OK) ||
!(rx_pkt_status & RX_MPDU_RES_STATUS_OVERRUN_OK)) {
IWL_DEBUG_RX(mvm, "Bad CRC or FIFO: 0x%08X.\n", rx_pkt_status);
- return 0;
+ rx_status.flag |= RX_FLAG_FAILED_FCS_CRC;
}
/* This will be used in several places later */
--
1.8.3.2
^ permalink raw reply related
* [PATCH 6/9] iwlwifi: mvm: add missing break in debugfs
From: Emmanuel Grumbach @ 2013-10-30 20:31 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless, Johannes Berg, Emmanuel Grumbach
In-Reply-To: <1383165097-4445-1-git-send-email-emmanuel.grumbach@intel.com>
From: Johannes Berg <johannes.berg@intel.com>
When writing the disable_power_off value, the LPRX
enable value also gets written unintentionally, so
fix that by adding the missing break statement.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/mvm/debugfs.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/wireless/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/iwlwifi/mvm/debugfs.c
index 0675f0c..9864d71 100644
--- a/drivers/net/wireless/iwlwifi/mvm/debugfs.c
+++ b/drivers/net/wireless/iwlwifi/mvm/debugfs.c
@@ -342,6 +342,7 @@ static void iwl_dbgfs_update_pm(struct iwl_mvm *mvm,
case MVM_DEBUGFS_PM_DISABLE_POWER_OFF:
IWL_DEBUG_POWER(mvm, "disable_power_off=%d\n", val);
dbgfs_pm->disable_power_off = val;
+ break;
case MVM_DEBUGFS_PM_LPRX_ENA:
IWL_DEBUG_POWER(mvm, "lprx %s\n", val ? "enabled" : "disabled");
dbgfs_pm->lprx_ena = val;
--
1.8.3.2
^ permalink raw reply related
* [PATCH 7/9] iwlwifi: warn if firmware image doesn't exist
From: Emmanuel Grumbach @ 2013-10-30 20:31 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless, Johannes Berg, Emmanuel Grumbach
In-Reply-To: <1383165097-4445-1-git-send-email-emmanuel.grumbach@intel.com>
From: Johannes Berg <johannes.berg@intel.com>
If the firmware image that we attempt to load doesn't
actually exist we have a broken firmware file or other
code not checking things correctly, so warn in such a
case. Also avoid assigning cur_ucode/ucode_loaded then.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/dvm/ucode.c | 9 ++++-----
drivers/net/wireless/iwlwifi/mvm/fw.c | 8 +++-----
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/dvm/ucode.c b/drivers/net/wireless/iwlwifi/dvm/ucode.c
index 86270b6..6363794 100644
--- a/drivers/net/wireless/iwlwifi/dvm/ucode.c
+++ b/drivers/net/wireless/iwlwifi/dvm/ucode.c
@@ -330,15 +330,14 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv,
enum iwl_ucode_type old_type;
static const u8 alive_cmd[] = { REPLY_ALIVE };
- old_type = priv->cur_ucode;
- priv->cur_ucode = ucode_type;
fw = iwl_get_ucode_image(priv, ucode_type);
+ if (WARN_ON(!fw))
+ return -EINVAL;
+ old_type = priv->cur_ucode;
+ priv->cur_ucode = ucode_type;
priv->ucode_loaded = false;
- if (!fw)
- return -EINVAL;
-
iwl_init_notification_wait(&priv->notif_wait, &alive_wait,
alive_cmd, ARRAY_SIZE(alive_cmd),
iwl_alive_fn, &alive_data);
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw.c b/drivers/net/wireless/iwlwifi/mvm/fw.c
index 83fc5ca..70e5297 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/iwlwifi/mvm/fw.c
@@ -151,13 +151,11 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm,
enum iwl_ucode_type old_type = mvm->cur_ucode;
static const u8 alive_cmd[] = { MVM_ALIVE };
- mvm->cur_ucode = ucode_type;
fw = iwl_get_ucode_image(mvm, ucode_type);
-
- mvm->ucode_loaded = false;
-
- if (!fw)
+ if (WARN_ON(!fw))
return -EINVAL;
+ mvm->cur_ucode = ucode_type;
+ mvm->ucode_loaded = false;
iwl_init_notification_wait(&mvm->notif_wait, &alive_wait,
alive_cmd, ARRAY_SIZE(alive_cmd),
--
1.8.3.2
^ permalink raw reply related
* [PATCH 8/9] iwlwifi: remove duplicate includes
From: Emmanuel Grumbach @ 2013-10-30 20:31 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless, Michael Opdenacker, Emmanuel Grumbach
In-Reply-To: <1383165097-4445-1-git-send-email-emmanuel.grumbach@intel.com>
From: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Reported by "make includecheck"
Tested that the corresponding sources still compile well on x86
Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/iwl-io.c | 1 -
drivers/net/wireless/iwlwifi/mvm/mvm.h | 1 -
2 files changed, 2 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.c b/drivers/net/wireless/iwlwifi/iwl-io.c
index dfa4d2e..ad8e19a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-io.c
+++ b/drivers/net/wireless/iwlwifi/iwl-io.c
@@ -34,7 +34,6 @@
#include "iwl-csr.h"
#include "iwl-debug.h"
#include "iwl-fh.h"
-#include "iwl-csr.h"
#define IWL_POLL_INTERVAL 10 /* microseconds */
diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h
index 6235cb7..fed21ef 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h
@@ -73,7 +73,6 @@
#include "iwl-trans.h"
#include "iwl-notif-wait.h"
#include "iwl-eeprom-parse.h"
-#include "iwl-trans.h"
#include "sta.h"
#include "fw-api.h"
#include "constants.h"
--
1.8.3.2
^ permalink raw reply related
* [PATCH 9/9] iwlwifi: mvm: BT Coex - fix copy paste issue
From: Emmanuel Grumbach @ 2013-10-30 20:31 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless, Emmanuel Grumbach
In-Reply-To: <1383165097-4445-1-git-send-email-emmanuel.grumbach@intel.com>
Putting the context id of the primary phy context in
the placeholder of the secondary is obviously a bad
idea.
Spotted by smatch.
Fixes: dac94da8dba3 ("iwlwifi: mvm: new BT Coex API")
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/mvm/bt-coex.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/iwlwifi/mvm/bt-coex.c b/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
index 7444b2a..5d066cb 100644
--- a/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
+++ b/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
@@ -755,7 +755,7 @@ static void iwl_mvm_bt_coex_notif_handle(struct iwl_mvm *mvm)
cmd.bt_secondary_ci =
iwl_ci_mask[chan->def.chan->hw_value][ci_bw_idx];
- cmd.secondary_ch_phy_id = *((u16 *)data.primary->drv_priv);
+ cmd.secondary_ch_phy_id = *((u16 *)data.secondary->drv_priv);
}
rcu_read_unlock();
--
1.8.3.2
^ permalink raw reply related
* [PATCH 0/7] wireless-regdb: DFS regions and optimizations
From: Luis R. Rodriguez @ 2013-10-30 21:45 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, wireless-regdb, Luis R. Rodriguez
This patch series associates a slew of countries
to DFS regions and then provides updates to 4
countries based on the new CRDA optimizer. The
optimizations have no functional changes other
than reducing the size of the regulatory domain
data strucutre that would be used to send to
the kernel.
Luis R. Rodriguez (7):
wireless-regdb: add DFS FCC regions
wireless-regdb: add DFS ETSI regions
wireless-regdb: add DFS JP regions
wireless-regdb: optimize two of DE's rules
wireless-regdb: optimize two of ES's rules
wireless-regdb: optimize two of IL's rules
wireless-regdb: optimize two of NL's rules
db.txt | 159 +++++++++++++++++++++++++++++++----------------------------------
1 file changed, 77 insertions(+), 82 deletions(-)
--
1.8.4.rc3
^ permalink raw reply
* [PATCH 1/7] wireless-regdb: add DFS FCC regions
From: Luis R. Rodriguez @ 2013-10-30 21:45 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, wireless-regdb, Luis R. Rodriguez
In-Reply-To: <1383169509-22619-1-git-send-email-mcgrof@do-not-panic.com>
This associates the following countries to the
DFS FCC region:
AE, AR, BB, BR, CA, CN, CO, CR, DO, EC,
GD, GT, GU, HN, JM, LB, LK, MY, MX, NZ,
PA, PE, PG, PH, PR, RW, SG, SV, TH, TT,
UY, UZ, VE, VN
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---
db.txt | 68 +++++++++++++++++++++++++++++++++---------------------------------
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/db.txt b/db.txt
index c938767..94da96a 100644
--- a/db.txt
+++ b/db.txt
@@ -18,7 +18,7 @@ country AD:
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country AE:
+country AE: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -39,7 +39,7 @@ country AN:
(5250 - 5330 @ 40), (20), DFS
(5490 - 5710 @ 40), (27), DFS
-country AR:
+country AR: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -80,7 +80,7 @@ country BA: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country BB:
+country BB: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (23)
(5250 - 5330 @ 40), (23), DFS
@@ -126,7 +126,7 @@ country BO:
(2402 - 2482 @ 40), (30)
(5735 - 5835 @ 40), (30)
-country BR:
+country BR: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -143,7 +143,7 @@ country BZ:
(2402 - 2482 @ 40), (30)
(5735 - 5835 @ 40), (30)
-country CA:
+country CA: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -164,7 +164,7 @@ country CL:
(5250 - 5330 @ 40), (20), DFS
(5735 - 5835 @ 40), (20)
-country CN:
+country CN: DFS-FCC
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 80), (30)
# 60 gHz band channels 1,4: 28dBm, channels 2,3: 44dBm
@@ -173,14 +173,14 @@ country CN:
(59400 - 63720 @ 2160), (44)
(63720 - 65880 @ 2160), (28)
-country CO:
+country CO: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country CR:
+country CR: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -239,7 +239,7 @@ country DK: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country DO:
+country DO: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (23), DFS
@@ -248,7 +248,7 @@ country DO:
country DZ:
(2402 - 2482 @ 40), (20)
-country EC:
+country EC: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -307,7 +307,7 @@ country GB: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country GD:
+country GD: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (20), DFS
@@ -328,20 +328,20 @@ country GL: DFS-ETSI
(5250 - 5330 @ 20), (20), DFS
(5490 - 5710 @ 20), (27), DFS
-country GT:
+country GT: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (23), DFS
(5735 - 5835 @ 40), (30)
-country GU:
+country GU: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country HN:
+country HN: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (20), DFS
@@ -421,7 +421,7 @@ country IT: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country JM:
+country JM: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (20), DFS
@@ -473,7 +473,7 @@ country KW:
country KZ:
(2402 - 2482 @ 40), (20)
-country LB:
+country LB: DFS-FCC
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
@@ -483,7 +483,7 @@ country LI: DFS-ETSI
(5250 - 5330 @ 40), (20), DFS
(5490 - 5710 @ 40), (27), DFS
-country LK:
+country LK: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 20), (17)
(5250 - 5330 @ 20), (20), DFS
@@ -546,13 +546,13 @@ country MT: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country MY:
+country MY: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (23), DFS
(5735 - 5835 @ 80), (30)
-country MX:
+country MX: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -579,7 +579,7 @@ country NP:
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
-country NZ:
+country NZ: DFS-FCC
(2402 - 2482 @ 40), (30)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -593,26 +593,26 @@ country OM:
(5490 - 5710 @ 40), (20), DFS
(5735 - 5835 @ 40), (30)
-country PA:
+country PA: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (23), DFS
(5735 - 5835 @ 40), (30)
-country PE:
+country PE: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country PG:
+country PG: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (23), DFS
(5735 - 5835 @ 40), (30)
-country PH:
+country PH: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -639,7 +639,7 @@ country PT: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country PR:
+country PR: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -674,7 +674,7 @@ country RU:
(5650 - 5710 @ 40), (30)
(5735 - 5835 @ 40), (30)
-country RW:
+country RW: DFS-FCC
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
@@ -693,7 +693,7 @@ country SE: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country SG:
+country SG: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -716,7 +716,7 @@ country SK: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country SV:
+country SV: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 20), (17)
(5250 - 5330 @ 20), (23), DFS
@@ -731,14 +731,14 @@ country TW:
(5490 - 5710 @ 80), (30), DFS
(5735 - 5815 @ 80), (30)
-country TH:
+country TH: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country TT:
+country TT: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (20), DFS
@@ -783,25 +783,25 @@ country US: DFS-FCC
# channels 1,2,3, EIRP=40dBm(43dBm peak)
(57240 - 63720 @ 2160), (40)
-country UY:
+country UY: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (20), DFS
(5490 - 5710 @ 40), (20), DFS
(5735 - 5835 @ 40), (30)
-country UZ:
+country UZ: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (20), DFS
(5490 - 5710 @ 40), (20), DFS
(5735 - 5835 @ 40), (30)
-country VE:
+country VE: DFS-FCC
(2402 - 2482 @ 40), (20)
(5735 - 5815 @ 40), (23)
-country VN:
+country VN: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
--
1.8.4.rc3
^ permalink raw reply related
* [PATCH 2/7] wireless-regdb: add DFS ETSI regions
From: Luis R. Rodriguez @ 2013-10-30 21:45 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, wireless-regdb, Luis R. Rodriguez
In-Reply-To: <1383169509-22619-1-git-send-email-mcgrof@do-not-panic.com>
This associates the following countries to the
DFS ETSI region:
AL, AM, AN, AW, AZ, BY, EG, GE, HT,
IL, KH, KW, MA, OM, RS, RU, SA, TN,
UA, ZA, ZW
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---
db.txt | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/db.txt b/db.txt
index 94da96a..1c20be2 100644
--- a/db.txt
+++ b/db.txt
@@ -25,15 +25,15 @@ country AE: DFS-FCC
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country AL:
+country AL: DFS-ETSI
(2402 - 2482 @ 20), (20)
-country AM:
+country AM: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 20), (18)
(5250 - 5330 @ 20), (18), DFS
-country AN:
+country AN: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (20)
(5250 - 5330 @ 40), (20), DFS
@@ -61,13 +61,13 @@ country AU:
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country AW:
+country AW: DFS-ETSI/
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (20)
(5250 - 5330 @ 40), (20), DFS
(5490 - 5710 @ 40), (27), DFS
-country AZ:
+country AZ: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (18)
(5250 - 5330 @ 40), (18), DFS
@@ -133,7 +133,7 @@ country BR: DFS-FCC
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country BY:
+country BY: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (20)
(5250 - 5330 @ 40), (20), DFS
@@ -263,7 +263,7 @@ country EE: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country EG:
+country EG: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 20), (20)
(5250 - 5330 @ 20), (20), DFS
@@ -292,7 +292,7 @@ country FR: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country GE:
+country GE: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (18)
(5250 - 5330 @ 40), (18), DFS
@@ -363,7 +363,7 @@ country HR: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country HT:
+country HT: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (20)
(5250 - 5330 @ 40), (20), DFS
@@ -390,7 +390,7 @@ country IE: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country IL:
+country IL: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5150 - 5250 @ 80), (200 mW), NO-OUTDOOR
(5250 - 5350 @ 80), (200 mW), NO-OUTDOOR
@@ -445,7 +445,7 @@ country KE:
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
-country KH:
+country KH: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (20)
(5250 - 5330 @ 40), (20), DFS
@@ -519,7 +519,7 @@ country MC: DFS-ETSI
(5170 - 5250 @ 40), (18)
(5250 - 5330 @ 40), (18), DFS
-country MA:
+country MA: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (23)
(5735 - 5835 @ 80), (23)
@@ -586,7 +586,7 @@ country NZ: DFS-FCC
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country OM:
+country OM: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (20), DFS
@@ -661,14 +661,14 @@ country RO: DFS-ETSI
# Source:
# http://www.ratel.rs/upload/documents/Plan_namene/Plan_namene-sl_glasnik.pdf
-country RS:
+country RS: DFS-ETSI
(2400 - 2483.5 @ 40), (100 mW)
(5150 - 5350 @ 40), (200 mW), NO-OUTDOOR
(5470 - 5725 @ 20), (1000 mW), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country RU:
+country RU: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5330 @ 40), (20)
(5650 - 5710 @ 40), (30)
@@ -678,7 +678,7 @@ country RW: DFS-FCC
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
-country SA:
+country SA: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -745,7 +745,7 @@ country TT: DFS-FCC
(5490 - 5710 @ 40), (20), DFS
(5735 - 5835 @ 40), (30)
-country TN:
+country TN: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 20), (20)
(5250 - 5330 @ 20), (20), DFS
@@ -765,7 +765,7 @@ country TR: DFS-ETSI
# Listed 5GHz range is a lowest common denominator for all related
# rules in the referenced laws. Such a range is used because of
# disputable definitions there.
-country UA:
+country UA: DFS-ETSI
(2400 - 2483.5 @ 40), (20), NO-OUTDOOR
(5150 - 5350 @ 40), (20), NO-OUTDOOR
# 60 gHz band channels 1-4, ref: Etsi En 302 567
@@ -811,13 +811,13 @@ country VN: DFS-FCC
country YE:
(2402 - 2482 @ 40), (20)
-country ZA:
+country ZA: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country ZW:
+country ZW: DFS-ETSI
(2402 - 2482 @ 40), (20)
--
1.8.4.rc3
^ permalink raw reply related
* [PATCH 3/7] wireless-regdb: add DFS JP regions
From: Luis R. Rodriguez @ 2013-10-30 21:45 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, wireless-regdb, Luis R. Rodriguez
In-Reply-To: <1383169509-22619-1-git-send-email-mcgrof@do-not-panic.com>
This associates the following countries to the
DFS JP region:
BD, BH, BN, BO, BZ, CL, DZ, ID, IN, IR
JP, JO, KE, KP, KR, NP, PK, QA, TW
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---
db.txt | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/db.txt b/db.txt
index 1c20be2..5ca9704 100644
--- a/db.txt
+++ b/db.txt
@@ -86,7 +86,7 @@ country BB: DFS-FCC
(5250 - 5330 @ 40), (23), DFS
(5735 - 5835 @ 40), (30)
-country BD:
+country BD: DFS-JP
(2402 - 2482 @ 40), (20)
country BE: DFS-ETSI
@@ -105,7 +105,7 @@ country BG: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country BH:
+country BH: DFS-JP
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 20), (20)
(5250 - 5330 @ 20), (20), DFS
@@ -116,13 +116,13 @@ country BL:
(5170 - 5250 @ 40), (18)
(5250 - 5330 @ 40), (18), DFS
-country BN:
+country BN: DFS-JP
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (20)
(5250 - 5330 @ 40), (20), DFS
(5735 - 5835 @ 40), (30)
-country BO:
+country BO: DFS-JP
(2402 - 2482 @ 40), (30)
(5735 - 5835 @ 40), (30)
@@ -139,7 +139,7 @@ country BY: DFS-ETSI
(5250 - 5330 @ 40), (20), DFS
(5490 - 5710 @ 40), (27), DFS
-country BZ:
+country BZ: DFS-JP
(2402 - 2482 @ 40), (30)
(5735 - 5835 @ 40), (30)
@@ -158,7 +158,7 @@ country CH: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country CL:
+country CL: DFS-JP
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (20)
(5250 - 5330 @ 40), (20), DFS
@@ -245,7 +245,7 @@ country DO: DFS-FCC
(5250 - 5330 @ 40), (23), DFS
(5735 - 5835 @ 40), (30)
-country DZ:
+country DZ: DFS-JP
(2402 - 2482 @ 40), (20)
country EC: DFS-FCC
@@ -377,7 +377,7 @@ country HU: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country ID:
+country ID: DFS-JP
# ref: http://www.postel.go.id/content/ID/regulasi/standardisasi/kepdir/bwa%205,8%20ghz.pdf
(2402 - 2482 @ 40), (20)
(5735 - 5815 @ 80), (20)
@@ -395,7 +395,7 @@ country IL: DFS-ETSI
(5150 - 5250 @ 80), (200 mW), NO-OUTDOOR
(5250 - 5350 @ 80), (200 mW), NO-OUTDOOR
-country IN:
+country IN: DFS-JP
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (20)
(5250 - 5330 @ 40), (20), DFS
@@ -409,7 +409,7 @@ country IS: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country IR:
+country IR: DFS-JP
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
@@ -428,7 +428,7 @@ country JM: DFS-FCC
(5490 - 5710 @ 40), (20), DFS
(5735 - 5835 @ 40), (30)
-country JP:
+country JP: DFS-JP
(2402 - 2482 @ 40), (20)
(2474 - 2494 @ 20), (20), NO-OFDM
(4910 - 4990 @ 40), (23)
@@ -437,11 +437,11 @@ country JP:
(5250 - 5330 @ 80), (20), DFS
(5490 - 5710 @ 160), (23), DFS
-country JO:
+country JO: DFS-JP
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (18)
-country KE:
+country KE: DFS-JP
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
@@ -451,7 +451,7 @@ country KH: DFS-ETSI
(5250 - 5330 @ 40), (20), DFS
(5490 - 5710 @ 40), (27), DFS
-country KP:
+country KP: DFS-JP
(2402 - 2482 @ 40), (20)
(5170 - 5330 @ 40), (20)
(5160 - 5250 @ 40), (20), DFS
@@ -575,7 +575,7 @@ country NO: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country NP:
+country NP: DFS-JP
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
@@ -619,7 +619,7 @@ country PH: DFS-FCC
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country PK:
+country PK: DFS-JP
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
@@ -646,7 +646,7 @@ country PR: DFS-FCC
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country QA:
+country QA: DFS-JP
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
@@ -725,7 +725,7 @@ country SV: DFS-FCC
country SY:
(2402 - 2482 @ 40), (20)
-country TW:
+country TW: DFS-JP
(2402 - 2472 @ 40), (27)
(5270 - 5330 @ 40), (17), DFS
(5490 - 5710 @ 80), (30), DFS
--
1.8.4.rc3
^ permalink raw reply related
* [PATCH 4/7] wireless-regdb: optimize two of DE's rules
From: Luis R. Rodriguez @ 2013-10-30 21:45 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, wireless-regdb, Luis R. Rodriguez
In-Reply-To: <1383169509-22619-1-git-send-email-mcgrof@do-not-panic.com>
There's no reason not to merge these two rules.
This as picked up by the new CRDA optimizer.
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---
db.txt | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/db.txt b/db.txt
index 5ca9704..da8fcfe 100644
--- a/db.txt
+++ b/db.txt
@@ -222,10 +222,8 @@ country CZ: DFS-ETSI
country DE: DFS-ETSI
# entries 279004 and 280006
(2400 - 2483.5 @ 40), (100 mW)
- # entry 303005
- (5150 - 5250 @ 80), (100 mW), NO-OUTDOOR
- # entries 304002 and 305002
- (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR
+ # entry 303005, 304002 and 305002
+ (5150 - 5350 @ 80), (100 mW), NO-OUTDOOR
# entries 308002, 309001 and 310003
(5470 - 5725 @ 80), (500 mW), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
--
1.8.4.rc3
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox