* linux-next: manual merge of the wireless tree with the wireless-current tree
@ 2011-04-05 2:21 Stephen Rothwell
0 siblings, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2011-04-05 2:21 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, linux-kernel, Larry Finger
[-- Attachment #1: Type: text/plain, Size: 486 bytes --]
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/rtlwifi/efuse.c between commit 2e3e66e3bbcd
("rtlwifi: Fix some warnings/bugs") from the wireless-current tree and
commit 324732848c42 ("rtlwifi: Remove unused/unneeded variables") from
the wireless tree.
The latter removes the line that the former modified, so I did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread* linux-next: manual merge of the wireless tree with the wireless-current tree
@ 2011-09-28 3:19 Stephen Rothwell
2011-09-28 9:10 ` Jouni Malinen
0 siblings, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2011-09-28 3:19 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, linux-kernel, Jouni Malinen
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
net/wireless/nl80211.c between commit 1b9ca0272ffa ("cfg80211: Fix
validation of AKM suites") from the wireless-current tree and commit
6d30240e3d68 ("cfg80211: Remove strict validation of AKM suites") from
the wireless tree.
The latter seems to make the former partly unneccessary, so I used that
(see below).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc net/wireless/nl80211.c
index 1b79a56,bf3fc4f..0000000
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@@ -4304,14 -4300,7 +4300,10 @@@ static int nl80211_crypto_settings(stru
if (len % sizeof(u32))
return -EINVAL;
+ if (settings->n_akm_suites > NL80211_MAX_NR_AKM_SUITES)
+ return -EINVAL;
+
memcpy(settings->akm_suites, data, len);
-
- for (i = 0; i < settings->n_akm_suites; i++)
- if (!nl80211_valid_akm_suite(settings->akm_suites[i]))
- return -EINVAL;
}
return 0;
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: linux-next: manual merge of the wireless tree with the wireless-current tree
2011-09-28 3:19 Stephen Rothwell
@ 2011-09-28 9:10 ` Jouni Malinen
0 siblings, 0 replies; 28+ messages in thread
From: Jouni Malinen @ 2011-09-28 9:10 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: John W. Linville, linux-next, linux-kernel
On Wed, Sep 28, 2011 at 01:19:17PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the wireless tree got a conflict in
> net/wireless/nl80211.c between commit 1b9ca0272ffa ("cfg80211: Fix
> validation of AKM suites") from the wireless-current tree and commit
> 6d30240e3d68 ("cfg80211: Remove strict validation of AKM suites") from
> the wireless tree.
>
> The latter seems to make the former partly unneccessary, so I used that
> (see below).
The former was a semi-urgent bug fix which was the reason for pushing it
out more quickly. The latter does indeed remove half of the fix (the
wrong count used in the for loop), but the first part to validate
n_akm_suites is still needed. As long as you kept that from the former,
the latter one should indeed be used. These commits should apply cleanly
on top of each other when applied, but I'm not sure how that ends up
being handled for linux-next.
--
Jouni Malinen PGP id EFC895FA
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: linux-next: manual merge of the wireless tree with the wireless-current tree
@ 2011-09-28 9:10 ` Jouni Malinen
0 siblings, 0 replies; 28+ messages in thread
From: Jouni Malinen @ 2011-09-28 9:10 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: John W. Linville, linux-next, linux-kernel
On Wed, Sep 28, 2011 at 01:19:17PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the wireless tree got a conflict in
> net/wireless/nl80211.c between commit 1b9ca0272ffa ("cfg80211: Fix
> validation of AKM suites") from the wireless-current tree and commit
> 6d30240e3d68 ("cfg80211: Remove strict validation of AKM suites") from
> the wireless tree.
>
> The latter seems to make the former partly unneccessary, so I used that
> (see below).
The former was a semi-urgent bug fix which was the reason for pushing it
out more quickly. The latter does indeed remove half of the fix (the
wrong count used in the for loop), but the first part to validate
n_akm_suites is still needed. As long as you kept that from the former,
the latter one should indeed be used. These commits should apply cleanly
on top of each other when applied, but I'm not sure how that ends up
being handled for linux-next.
--
Jouni Malinen PGP id EFC895FA
^ permalink raw reply [flat|nested] 28+ messages in thread
* linux-next: manual merge of the wireless tree with the wireless-current tree
@ 2011-09-14 3:05 Stephen Rothwell
0 siblings, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2011-09-14 3:05 UTC (permalink / raw)
To: John W. Linville
Cc: linux-next, linux-kernel, Johannes Berg, Wey-Yi Guy, Emmanuel Grumbach
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c between commit
282cdb325aea ("iwlagn: fix command queue timeout") from the
wireless-current tree and commit 6d8f6eeb3506 ("iwlagn: transport layer
should receive iwl_trans") from the wireless tree.
Just context changes. I fixed ti up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
index 222d410,ea6a0bc..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
@@@ -771,9 -921,8 +921,10 @@@ void iwl_tx_cmd_complete(struct iwl_pri
cmd = txq->cmd[cmd_index];
meta = &txq->meta[cmd_index];
+ txq->time_stamp = jiffies;
+
- iwlagn_unmap_tfd(priv, meta, &txq->tfds[index], DMA_BIDIRECTIONAL);
+ iwlagn_unmap_tfd(trans, meta, &txq->tfds[index],
+ DMA_BIDIRECTIONAL);
/* Input error checking is done when commands are added to queue. */
if (meta->flags & CMD_WANT_SKB) {
^ permalink raw reply [flat|nested] 28+ messages in thread* linux-next: manual merge of the wireless tree with the wireless-current tree
@ 2011-06-21 1:49 Stephen Rothwell
2011-06-21 18:05 ` Gustavo F. Padovan
0 siblings, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2011-06-21 1:49 UTC (permalink / raw)
To: John W. Linville
Cc: linux-next, linux-kernel, Gustavo F. Padovan, Johan Hedberg
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
net/bluetooth/l2cap_core.c between commit df3c3931ec58 ("Bluetooth: Fix
accepting connect requests for defer_setup") from the wireless-current
tree and commit ab07801d2898 ("Bluetooth: create channel timer to replace
sk_timer") from the wireless tree.
Jusr context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc net/bluetooth/l2cap_core.c
index 56fdd91,dff9d76..0000000
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@@ -4002,24 -4205,15 +4205,24 @@@ static int l2cap_security_cfm(struct hc
}
} else if (sk->sk_state == BT_CONNECT2) {
struct l2cap_conn_rsp rsp;
- __u16 result;
+ __u16 res, stat;
if (!status) {
- sk->sk_state = BT_CONFIG;
- result = L2CAP_CR_SUCCESS;
+ if (bt_sk(sk)->defer_setup) {
+ struct sock *parent = bt_sk(sk)->parent;
+ res = L2CAP_CR_PEND;
+ stat = L2CAP_CS_AUTHOR_PEND;
+ parent->sk_data_ready(parent, 0);
+ } else {
+ sk->sk_state = BT_CONFIG;
+ res = L2CAP_CR_SUCCESS;
+ stat = L2CAP_CS_NO_INFO;
+ }
} else {
sk->sk_state = BT_DISCONN;
- l2cap_sock_set_timer(sk, HZ / 10);
+ l2cap_chan_set_timer(chan, HZ / 10);
- result = L2CAP_CR_SEC_BLOCK;
+ res = L2CAP_CR_SEC_BLOCK;
+ stat = L2CAP_CS_NO_INFO;
}
rsp.scid = cpu_to_le16(chan->dcid);
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: linux-next: manual merge of the wireless tree with the wireless-current tree
2011-06-21 1:49 Stephen Rothwell
@ 2011-06-21 18:05 ` Gustavo F. Padovan
0 siblings, 0 replies; 28+ messages in thread
From: Gustavo F. Padovan @ 2011-06-21 18:05 UTC (permalink / raw)
To: Stephen Rothwell
Cc: John W. Linville, linux-next, linux-kernel, Johan Hedberg
Hi John,
* Stephen Rothwell <sfr@canb.auug.org.au> [2011-06-21 11:49:57 +1000]:
> Hi John,
>
> Today's linux-next merge of the wireless tree got a conflict in
> net/bluetooth/l2cap_core.c between commit df3c3931ec58 ("Bluetooth: Fix
> accepting connect requests for defer_setup") from the wireless-current
> tree and commit ab07801d2898 ("Bluetooth: create channel timer to replace
> sk_timer") from the wireless tree.
I merged bluetooth-2.6 and bluetooth-next-2.6 to fix this and will send a pull
request to you in a minute.
Gustavo
^ permalink raw reply [flat|nested] 28+ messages in thread
* linux-next: manual merge of the wireless tree with the wireless-current tree
@ 2011-04-05 2:21 Stephen Rothwell
0 siblings, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2011-04-05 2:21 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, linux-kernel, Larry Finger
[-- Attachment #1: Type: text/plain, Size: 499 bytes --]
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c between commit
2e3e66e3bbcd ("rtlwifi: Fix some warnings/bugs") from the
wireless-current tree and commit 324732848c42 ("rtlwifi: Remove
unused/unneeded variables") from the wireless tree.
The latter removes the line that the former modified, so I did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread* linux-next: manual merge of the wireless tree with the wireless-current tree
@ 2010-12-14 2:22 Stephen Rothwell
0 siblings, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2010-12-14 2:22 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, linux-kernel, Wey-Yi Guy, Johannes Berg
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h between commit
6942fec92d3d1b6918425730de31b4c6d0d5c196 ("iwlagn: implement
layout-agnostic EEPROM reading") from the wireless-current tree and
commit 564b344c10b694d433cef5b89f8ff8ac5e33898d ("iwlwifi: change default
led mode for different devices") from the wireless tree.
I fixed it up (hopefully, see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/wireless/iwlwifi/iwl-1000.c
index 0e027f7,3c983e4..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@@ -315,7 -310,7 +310,8 @@@ struct iwl_cfg iwl100_bgn_cfg =
.mod_params = &iwlagn_mod_params,
.base_params = &iwl1000_base_params,
.ht_params = &iwl1000_ht_params,
+ .use_new_eeprom_reading = true,
+ .led_mode = IWL_LED_RF_STATE,
};
struct iwl_cfg iwl100_bg_cfg = {
@@@ -331,7 -323,7 +324,8 @@@
.ops = &iwl1000_ops,
.mod_params = &iwlagn_mod_params,
.base_params = &iwl1000_base_params,
+ .use_new_eeprom_reading = true,
+ .led_mode = IWL_LED_RF_STATE,
};
MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_MAX));
diff --cc drivers/net/wireless/iwlwifi/iwl-6000.c
index 0ceeaac,808942c..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@@ -561,11 -563,11 +563,12 @@@ struct iwl_cfg iwl6005_2agn_cfg =
.ht_params = &iwl6000_ht_params,
.need_dc_calib = true,
.need_temp_offset_calib = true,
+ .use_new_eeprom_reading = true,
+ .led_mode = IWL_LED_RF_STATE,
};
- struct iwl_cfg iwl6000g2a_2abg_cfg = {
- .name = "6000 Series 2x2 ABG Gen2a",
+ struct iwl_cfg iwl6005_2abg_cfg = {
+ .name = "Intel(R) Centrino(R) Advanced-N 6205 ABG",
.fw_name_pre = IWL6000G2A_FW_PRE,
.ucode_api_max = IWL6000G2_UCODE_API_MAX,
.ucode_api_min = IWL6000G2_UCODE_API_MIN,
@@@ -579,11 -578,11 +579,12 @@@
.base_params = &iwl6000_base_params,
.need_dc_calib = true,
.need_temp_offset_calib = true,
+ .use_new_eeprom_reading = true,
+ .led_mode = IWL_LED_RF_STATE,
};
- struct iwl_cfg iwl6000g2a_2bg_cfg = {
- .name = "6000 Series 2x2 BG Gen2a",
+ struct iwl_cfg iwl6005_2bg_cfg = {
+ .name = "Intel(R) Centrino(R) Advanced-N 6205 BG",
.fw_name_pre = IWL6000G2A_FW_PRE,
.ucode_api_max = IWL6000G2_UCODE_API_MAX,
.ucode_api_min = IWL6000G2_UCODE_API_MIN,
@@@ -597,11 -593,11 +595,12 @@@
.base_params = &iwl6000_base_params,
.need_dc_calib = true,
.need_temp_offset_calib = true,
+ .use_new_eeprom_reading = true,
+ .led_mode = IWL_LED_RF_STATE,
};
- struct iwl_cfg iwl6000g2b_2agn_cfg = {
- .name = "6000 Series 2x2 AGN Gen2b",
+ struct iwl_cfg iwl6030_2agn_cfg = {
+ .name = "Intel(R) Centrino(R) Advanced-N 6230 AGN",
.fw_name_pre = IWL6000G2B_FW_PRE,
.ucode_api_max = IWL6000G2_UCODE_API_MAX,
.ucode_api_min = IWL6000G2_UCODE_API_MIN,
@@@ -617,13 -610,14 +613,15 @@@
.ht_params = &iwl6000_ht_params,
.need_dc_calib = true,
.need_temp_offset_calib = true,
+ .led_mode = IWL_LED_RF_STATE,
+ .adv_pm = true,
/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
+ .use_new_eeprom_reading = true,
};
- struct iwl_cfg iwl6000g2b_2abg_cfg = {
- .name = "6000 Series 2x2 ABG Gen2b",
+ struct iwl_cfg iwl6030_2abg_cfg = {
+ .name = "Intel(R) Centrino(R) Advanced-N 6230 ABG",
.fw_name_pre = IWL6000G2B_FW_PRE,
.ucode_api_max = IWL6000G2_UCODE_API_MAX,
.ucode_api_min = IWL6000G2_UCODE_API_MIN,
@@@ -638,13 -629,14 +633,15 @@@
.bt_params = &iwl6000_bt_params,
.need_dc_calib = true,
.need_temp_offset_calib = true,
+ .led_mode = IWL_LED_RF_STATE,
+ .adv_pm = true,
/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
+ .use_new_eeprom_reading = true,
};
- struct iwl_cfg iwl6000g2b_2bgn_cfg = {
- .name = "6000 Series 2x2 BGN Gen2b",
+ struct iwl_cfg iwl6030_2bgn_cfg = {
+ .name = "Intel(R) Centrino(R) Advanced-N 6230 BGN",
.fw_name_pre = IWL6000G2B_FW_PRE,
.ucode_api_max = IWL6000G2_UCODE_API_MAX,
.ucode_api_min = IWL6000G2_UCODE_API_MIN,
@@@ -660,13 -649,14 +654,15 @@@
.ht_params = &iwl6000_ht_params,
.need_dc_calib = true,
.need_temp_offset_calib = true,
+ .led_mode = IWL_LED_RF_STATE,
+ .adv_pm = true,
/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
+ .use_new_eeprom_reading = true,
};
- struct iwl_cfg iwl6000g2b_2bg_cfg = {
- .name = "6000 Series 2x2 BG Gen2b",
+ struct iwl_cfg iwl6030_2bg_cfg = {
+ .name = "Intel(R) Centrino(R) Advanced-N 6230 BG",
.fw_name_pre = IWL6000G2B_FW_PRE,
.ucode_api_max = IWL6000G2_UCODE_API_MAX,
.ucode_api_min = IWL6000G2_UCODE_API_MIN,
@@@ -681,13 -668,14 +674,15 @@@
.bt_params = &iwl6000_bt_params,
.need_dc_calib = true,
.need_temp_offset_calib = true,
+ .led_mode = IWL_LED_RF_STATE,
+ .adv_pm = true,
/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
+ .use_new_eeprom_reading = true,
};
- struct iwl_cfg iwl6000g2b_bgn_cfg = {
- .name = "6000 Series 1x2 BGN Gen2b",
+ struct iwl_cfg iwl1030_bgn_cfg = {
+ .name = "Intel(R) Centrino(R) Wireless-N 1030 BGN",
.fw_name_pre = IWL6000G2B_FW_PRE,
.ucode_api_max = IWL6000G2_UCODE_API_MAX,
.ucode_api_min = IWL6000G2_UCODE_API_MIN,
@@@ -703,13 -688,14 +695,15 @@@
.ht_params = &iwl6000_ht_params,
.need_dc_calib = true,
.need_temp_offset_calib = true,
+ .led_mode = IWL_LED_RF_STATE,
+ .adv_pm = true,
/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
+ .use_new_eeprom_reading = true,
};
- struct iwl_cfg iwl6000g2b_bg_cfg = {
- .name = "6000 Series 1x2 BG Gen2b",
+ struct iwl_cfg iwl1030_bg_cfg = {
+ .name = "Intel(R) Centrino(R) Wireless-N 1030 BG",
.fw_name_pre = IWL6000G2B_FW_PRE,
.ucode_api_max = IWL6000G2_UCODE_API_MAX,
.ucode_api_min = IWL6000G2_UCODE_API_MIN,
@@@ -724,9 -707,10 +715,11 @@@
.bt_params = &iwl6000_bt_params,
.need_dc_calib = true,
.need_temp_offset_calib = true,
+ .led_mode = IWL_LED_RF_STATE,
+ .adv_pm = true,
/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
+ .use_new_eeprom_reading = true,
};
/*
@@@ -813,7 -792,7 +801,8 @@@ struct iwl_cfg iwl6150_bgn_cfg =
.base_params = &iwl6050_base_params,
.ht_params = &iwl6000_ht_params,
.need_dc_calib = true,
+ .use_new_eeprom_reading = true,
+ .led_mode = IWL_LED_RF_STATE,
};
struct iwl_cfg iwl6050_2abg_cfg = {
@@@ -865,9 -837,10 +847,11 @@@ struct iwl_cfg iwl130_bgn_cfg =
.bt_params = &iwl6000_bt_params,
.ht_params = &iwl6000_ht_params,
.need_dc_calib = true,
+ .led_mode = IWL_LED_RF_STATE,
+ .adv_pm = true,
/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
+ .use_new_eeprom_reading = true,
};
struct iwl_cfg iwl130_bg_cfg = {
@@@ -885,9 -855,10 +866,11 @@@
.base_params = &iwl6000_coex_base_params,
.bt_params = &iwl6000_bt_params,
.need_dc_calib = true,
+ .led_mode = IWL_LED_RF_STATE,
+ .adv_pm = true,
/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
+ .use_new_eeprom_reading = true,
};
MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));
diff --cc drivers/net/wireless/iwlwifi/iwl-core.h
index 954ecc2,568920a..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@@ -390,7 -410,8 +410,9 @@@ struct iwl_cfg
const bool need_temp_offset_calib; /* if used set to true */
u8 scan_rx_antennas[IEEE80211_NUM_BANDS];
u8 scan_tx_antennas[IEEE80211_NUM_BANDS];
+ const bool use_new_eeprom_reading; /* temporary, remove later */
+ enum iwl_led_mode led_mode;
+ const bool adv_pm;
};
/***************************
^ permalink raw reply [flat|nested] 28+ messages in thread* linux-next: manual merge of the wireless tree with the wireless-current tree
@ 2010-08-30 1:58 Stephen Rothwell
0 siblings, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2010-08-30 1:58 UTC (permalink / raw)
To: John W. Linville
Cc: linux-next, linux-kernel, Christian Lamparter, Johannes Berg
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
net/mac80211/main.c between commit
95fed448c6d7dac3fb36847cda7094f3524a6cb7 ("mac80211: delete work timer")
from the wireless-current tree and commit
258086a48b766d12a500f98834654ffa927ca475 ("mac80211: cancel restart_work
in ieee80211_unregister_hw") from the wireless tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc net/mac80211/main.c
index ea433b6,93194f6..0000000
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@@ -807,12 -844,7 +844,13 @@@ void ieee80211_unregister_hw(struct iee
rtnl_unlock();
+ /*
+ * Now all work items will be gone, but the
+ * timer might still be armed, so delete it
+ */
+ del_timer_sync(&local->work_timer);
+
+ cancel_work_sync(&local->restart_work);
cancel_work_sync(&local->reconfig_filter);
ieee80211_clear_tx_pending(local);
^ permalink raw reply [flat|nested] 28+ messages in thread* linux-next: manual merge of the wireless tree with the wireless-current tree
@ 2010-04-09 1:05 Stephen Rothwell
0 siblings, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2010-04-09 1:05 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, linux-kernel, Wey-Yi Guy
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-4965.c between commit
ece6444c2fe80dab679beb5f0d58b091f1933b00 ("iwlwifi: need check for valid
qos packet before free") from the wireless-current tree and commit
74bcdb33e99f49ef5202dd2f8109945b4570edc2 ("iwlwifi: move agn only tx
functions from iwlcore to iwlagn") from the wireless tree.
Just context changes. I fixed it up (see below) and can carry the fix
for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/wireless/iwlwifi/iwl-4965.c
index 89aba76,6edae9b..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@@ -2020,10 -2013,8 +2013,10 @@@ static void iwl4965_rx_reply_tx(struct
index = iwl_queue_dec_wrap(scd_ssn & 0xff, txq->q.n_bd);
IWL_DEBUG_TX_REPLY(priv, "Retry scheduler reclaim scd_ssn "
"%d index %d\n", scd_ssn , index);
- freed = iwl_tx_queue_reclaim(priv, txq_id, index);
+ freed = iwlagn_tx_queue_reclaim(priv, txq_id, index);
- iwl_free_tfds_in_queue(priv, sta_id, tid, freed);
+ if (qc)
+ iwl_free_tfds_in_queue(priv, sta_id,
+ tid, freed);
if (priv->mac80211_registered &&
(iwl_queue_space(&txq->q) > txq->q.low_mark) &&
@@@ -2048,18 -2039,15 +2041,18 @@@
le32_to_cpu(tx_resp->rate_n_flags),
tx_resp->failure_frame);
- freed = iwl_tx_queue_reclaim(priv, txq_id, index);
+ freed = iwlagn_tx_queue_reclaim(priv, txq_id, index);
- iwl_free_tfds_in_queue(priv, sta_id, tid, freed);
+ if (qc && likely(sta_id != IWL_INVALID_STATION))
+ iwl_free_tfds_in_queue(priv, sta_id, tid, freed);
+ else if (sta_id == IWL_INVALID_STATION)
+ IWL_DEBUG_TX_REPLY(priv, "Station not known\n");
if (priv->mac80211_registered &&
(iwl_queue_space(&txq->q) > txq->q.low_mark))
iwl_wake_queue(priv, txq_id);
}
-
- iwlagn_txq_check_empty(priv, sta_id, tid, txq_id);
+ if (qc && likely(sta_id != IWL_INVALID_STATION))
- iwl_txq_check_empty(priv, sta_id, tid, txq_id);
++ iwlagn_txq_check_empty(priv, sta_id, tid, txq_id);
if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK))
IWL_ERR(priv, "TODO: Implement Tx ABORT REQUIRED!!!\n");
^ permalink raw reply [flat|nested] 28+ messages in thread* linux-next: manual merge of the wireless tree with the wireless-current tree
@ 2010-04-07 2:58 Stephen Rothwell
2010-04-07 14:44 ` John W. Linville
0 siblings, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2010-04-07 2:58 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, linux-kernel, Zhu Yi
[-- Attachment #1: Type: text/plain, Size: 808 bytes --]
Hi John,
Today's linux-next merge of the wireless tree got conflicts in
drivers/net/wireless/iwlwifi/iwl-core.c,
drivers/net/wireless/iwlwifi/iwl-tx.c and
drivers/net/wireless/iwlwifi/iwl-core.h between commit
de0f60ea94e132c858caa64a44b2012e1e8580b0 ("iwlwifi: avoid Tx queue memory
allocation in interface down") from the wireless-current tree and commit
74bcdb33e99f49ef5202dd2f8109945b4570edc2 ("iwlwifi: move agn only tx
functions from iwlcore to iwlagn") from the wireless tree.
The latter moved the code modified by the former. I couldn't see any
easy way to fix this up, so I effectively reverted the change in the
wireless-current tree. Please do the merge fixup, thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: linux-next: manual merge of the wireless tree with the wireless-current tree
2010-04-07 2:58 Stephen Rothwell
@ 2010-04-07 14:44 ` John W. Linville
2010-04-07 15:31 ` Stephen Rothwell
2010-04-07 23:19 ` David Miller
0 siblings, 2 replies; 28+ messages in thread
From: John W. Linville @ 2010-04-07 14:44 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Zhu Yi
On Wed, Apr 07, 2010 at 12:58:28PM +1000, Stephen Rothwell wrote:
> Hi John,
>
> Today's linux-next merge of the wireless tree got conflicts in
> drivers/net/wireless/iwlwifi/iwl-core.c,
> drivers/net/wireless/iwlwifi/iwl-tx.c and
> drivers/net/wireless/iwlwifi/iwl-core.h between commit
> de0f60ea94e132c858caa64a44b2012e1e8580b0 ("iwlwifi: avoid Tx queue memory
> allocation in interface down") from the wireless-current tree and commit
> 74bcdb33e99f49ef5202dd2f8109945b4570edc2 ("iwlwifi: move agn only tx
> functions from iwlcore to iwlagn") from the wireless tree.
>
> The latter moved the code modified by the former. I couldn't see any
> easy way to fix this up, so I effectively reverted the change in the
> wireless-current tree. Please do the merge fixup, thanks.
OK, I'll try to negotiate this today.
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: linux-next: manual merge of the wireless tree with the wireless-current tree
2010-04-07 14:44 ` John W. Linville
@ 2010-04-07 15:31 ` Stephen Rothwell
2010-04-07 23:19 ` David Miller
1 sibling, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2010-04-07 15:31 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, linux-kernel, Zhu Yi
[-- Attachment #1: Type: text/plain, Size: 273 bytes --]
Hi John,
On Wed, 7 Apr 2010 10:44:34 -0400 "John W. Linville" <linville@tuxdriver.com> wrote:
>
> OK, I'll try to negotiate this today.
Excellent, thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: linux-next: manual merge of the wireless tree with the wireless-current tree
2010-04-07 14:44 ` John W. Linville
2010-04-07 15:31 ` Stephen Rothwell
@ 2010-04-07 23:19 ` David Miller
1 sibling, 0 replies; 28+ messages in thread
From: David Miller @ 2010-04-07 23:19 UTC (permalink / raw)
To: linville; +Cc: sfr, linux-next, linux-kernel, yi.zhu
From: "John W. Linville" <linville@tuxdriver.com>
Date: Wed, 7 Apr 2010 10:44:34 -0400
> On Wed, Apr 07, 2010 at 12:58:28PM +1000, Stephen Rothwell wrote:
>> Hi John,
>>
>> Today's linux-next merge of the wireless tree got conflicts in
>> drivers/net/wireless/iwlwifi/iwl-core.c,
>> drivers/net/wireless/iwlwifi/iwl-tx.c and
>> drivers/net/wireless/iwlwifi/iwl-core.h between commit
>> de0f60ea94e132c858caa64a44b2012e1e8580b0 ("iwlwifi: avoid Tx queue memory
>> allocation in interface down") from the wireless-current tree and commit
>> 74bcdb33e99f49ef5202dd2f8109945b4570edc2 ("iwlwifi: move agn only tx
>> functions from iwlcore to iwlagn") from the wireless tree.
>>
>> The latter moved the code modified by the former. I couldn't see any
>> easy way to fix this up, so I effectively reverted the change in the
>> wireless-current tree. Please do the merge fixup, thanks.
>
> OK, I'll try to negotiate this today.
I think I took care of this when I merged net-2.6 into
net-next-2.6 last night.
^ permalink raw reply [flat|nested] 28+ messages in thread
* linux-next: manual merge of the wireless tree with the wireless-current tree
@ 2010-04-01 1:59 Stephen Rothwell
2010-04-01 11:43 ` John W. Linville
0 siblings, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2010-04-01 1:59 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, linux-kernel, Wey-Yi Guy, Reinette Chatre
[-- Attachment #1: Type: text/plain, Size: 1649 bytes --]
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-4965.c between commit
be6b38bcb175613f239e0b302607db346472c6b6 ("iwlwifi: counting number of
tfds can be free for 4965") from the wireless-current tree and commit
74bcdb33e99f49ef5202dd2f8109945b4570edc2 ("iwlwifi: move agn only tx
functions from iwlcore to iwlagn") from the wireless tree.
I fixed it up (see below) and can carry the fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/wireless/iwlwifi/iwl-4965.c
index 3297fc7,1808c97..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@@ -2046,15 -2047,17 +2047,15 @@@ static void iwl4965_rx_reply_tx(struct
le32_to_cpu(tx_resp->rate_n_flags),
tx_resp->failure_frame);
- freed = iwl_tx_queue_reclaim(priv, txq_id, index);
+ freed = iwlagn_tx_queue_reclaim(priv, txq_id, index);
- if (qc && likely(sta_id != IWL_INVALID_STATION))
- priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;
+ iwl_free_tfds_in_queue(priv, sta_id, tid, freed);
if (priv->mac80211_registered &&
(iwl_queue_space(&txq->q) > txq->q.low_mark))
iwl_wake_queue(priv, txq_id);
}
- iwl_txq_check_empty(priv, sta_id, tid, txq_id);
- if (qc && likely(sta_id != IWL_INVALID_STATION))
- iwlagn_txq_check_empty(priv, sta_id, tid, txq_id);
++ iwlagn_txq_check_empty(priv, sta_id, tid, txq_id);
if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK))
IWL_ERR(priv, "TODO: Implement Tx ABORT REQUIRED!!!\n");
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: linux-next: manual merge of the wireless tree with the wireless-current tree
2010-04-01 1:59 Stephen Rothwell
@ 2010-04-01 11:43 ` John W. Linville
0 siblings, 0 replies; 28+ messages in thread
From: John W. Linville @ 2010-04-01 11:43 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Wey-Yi Guy, Reinette Chatre
On Thu, Apr 01, 2010 at 12:59:44PM +1100, Stephen Rothwell wrote:
> Hi John,
>
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/net/wireless/iwlwifi/iwl-4965.c between commit
> be6b38bcb175613f239e0b302607db346472c6b6 ("iwlwifi: counting number of
> tfds can be free for 4965") from the wireless-current tree and commit
> 74bcdb33e99f49ef5202dd2f8109945b4570edc2 ("iwlwifi: move agn only tx
> functions from iwlcore to iwlagn") from the wireless tree.
>
> I fixed it up (see below) and can carry the fix for a while.
Yes, that looks correct to me.
Thanks!
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 28+ messages in thread
* linux-next: manual merge of the wireless tree with the wireless-current tree
@ 2010-03-11 2:15 Stephen Rothwell
2010-03-11 2:38 ` Bruno Randolf
0 siblings, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2010-03-11 2:15 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, linux-kernel, Bruno Randolf
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/ath/ath5k/phy.c between commit
86415d43efd4f7093979cfa8a80232114266f1a4 ("ath5k: fix I/Q calibration
(for real)") from the wireless-current tree and commit
49a85d211a63ad1d565842ebc535c5168d85d86a ("ath5k: IQ calibration for
AR5211 is slightly different") from the wireless tree.
I fixed it up (I think - see below) and can carry the fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/wireless/ath/ath5k/phy.c
index eff3323,20d562b..0000000
--- a/drivers/net/wireless/ath/ath5k/phy.c
+++ b/drivers/net/wireless/ath/ath5k/phy.c
@@@ -1399,26 -1391,38 +1397,33 @@@ static int ath5k_hw_rf511x_calibrate(st
}
i_coffd = ((i_pwr >> 1) + (q_pwr >> 1)) >> 7;
- q_coffd = q_pwr >> 7;
+
+ if (ah->ah_version == AR5K_AR5211)
+ q_coffd = q_pwr >> 6;
+ else
+ q_coffd = q_pwr >> 7;
- /* No correction */
- if (i_coffd == 0 || q_coffd == 0)
+ /* protect against divide by 0 and loss of sign bits */
+ if (i_coffd == 0 || q_coffd < 2)
goto done;
- i_coff = ((-iq_corr) / i_coffd);
-
- /* Boundary check */
- if (i_coff > 31)
- i_coff = 31;
- if (i_coff < -32)
- i_coff = -32;
+ i_coff = (-iq_corr) / i_coffd;
+ i_coff = clamp(i_coff, -32, 31); /* signed 6 bit */
- q_coff = (i_pwr / q_coffd) - 128;
+ if (ah->ah_version == AR5K_AR5211)
+ q_coff = (i_pwr / q_coffd) - 64;
+ else
+ q_coff = (i_pwr / q_coffd) - 128;
+ q_coff = clamp(q_coff, -16, 15); /* signed 5 bit */
- /* Boundary check */
- if (q_coff > 15)
- q_coff = 15;
- if (q_coff < -16)
- q_coff = -16;
+ ATH5K_DBG_UNLIMIT(ah->ah_sc, ATH5K_DEBUG_CALIBRATE,
+ "new I:%d Q:%d (i_coffd:%x q_coffd:%x)",
+ i_coff, q_coff, i_coffd, q_coffd);
- /* Commit new I/Q value */
- AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_IQ, AR5K_PHY_IQ_CORR_ENABLE |
- ((u32)q_coff) | ((u32)i_coff << AR5K_PHY_IQ_CORR_Q_I_COFF_S));
+ /* Commit new I/Q values (set enable bit last to match HAL sources) */
+ AR5K_REG_WRITE_BITS(ah, AR5K_PHY_IQ, AR5K_PHY_IQ_CORR_Q_I_COFF, i_coff);
+ AR5K_REG_WRITE_BITS(ah, AR5K_PHY_IQ, AR5K_PHY_IQ_CORR_Q_Q_COFF, q_coff);
+ AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_IQ, AR5K_PHY_IQ_CORR_ENABLE);
/* Re-enable calibration -if we don't we'll commit
* the same values again and again */
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: linux-next: manual merge of the wireless tree with the wireless-current tree
2010-03-11 2:15 Stephen Rothwell
@ 2010-03-11 2:38 ` Bruno Randolf
2010-03-11 3:04 ` Stephen Rothwell
0 siblings, 1 reply; 28+ messages in thread
From: Bruno Randolf @ 2010-03-11 2:38 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: John W. Linville, linux-next, linux-kernel
On Thursday 11 March 2010 11:15:00 Stephen Rothwell wrote:
> Hi John,
>
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/net/wireless/ath/ath5k/phy.c between commit
> 86415d43efd4f7093979cfa8a80232114266f1a4 ("ath5k: fix I/Q calibration
> (for real)") from the wireless-current tree and commit
> 49a85d211a63ad1d565842ebc535c5168d85d86a ("ath5k: IQ calibration for
> AR5211 is slightly different") from the wireless tree.
>
> I fixed it up (I think - see below) and can carry the fix for a while.
not sure what happened...
but wireless-next-2.6.git 86415d43efd4f7093979cfa8a80232114266f1a4 is an older
version of my patch. i have sent one which applies cleanly later on.
your fix is correct, though.
bruno
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: linux-next: manual merge of the wireless tree with the wireless-current tree
2010-03-11 2:38 ` Bruno Randolf
@ 2010-03-11 3:04 ` Stephen Rothwell
0 siblings, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2010-03-11 3:04 UTC (permalink / raw)
To: Bruno Randolf; +Cc: John W. Linville, linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 583 bytes --]
Hi Bruno,
On Thu, 11 Mar 2010 11:38:11 +0900 Bruno Randolf <br1@einfach.org> wrote:
>
> not sure what happened...
>
> but wireless-next-2.6.git 86415d43efd4f7093979cfa8a80232114266f1a4 is an older
> version of my patch. i have sent one which applies cleanly later on.
The tree I call wireless-current usually only contains bug fixes, the
tree I call wireless is stuff for the next release ...
> your fix is correct, though.
Thanks for the confirmation.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread
* linux-next: manual merge of the wireless tree with the wireless-current tree
@ 2010-02-23 1:26 Stephen Rothwell
0 siblings, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2010-02-23 1:26 UTC (permalink / raw)
To: John W. Linville
Cc: linux-next, linux-kernel, Abhijeet Kolekar, Reinette Chatre, Wey-Yi Guy
Hi "John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-core.h between commit
a239a8b47cc0e5e6d7416a89f340beac06d5edaa ("iwlwifi: error checking for
number of tfds in queue") from the wireless-current tree and commit
7bfedc59ee350727b115bbc79780c69b114f162d ("iwlwifi: cleanup return
values") from the wireless tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/wireless/iwlwifi/iwl-core.h
index 1b0701b,3df7933..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@@ -450,9 -451,7 +451,9 @@@ int iwl_tx_skb(struct iwl_priv *priv, s
void iwl_hw_txq_ctx_free(struct iwl_priv *priv);
int iwl_hw_tx_queue_init(struct iwl_priv *priv,
struct iwl_tx_queue *txq);
- int iwl_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq);
+ void iwl_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq);
+void iwl_free_tfds_in_queue(struct iwl_priv *priv,
+ int sta_id, int tid, int freed);
int iwl_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq,
int slots_num, u32 txq_id);
void iwl_tx_queue_free(struct iwl_priv *priv, int txq_id);
^ permalink raw reply [flat|nested] 28+ messages in thread* linux-next: manual merge of the wireless tree with the wireless-current tree
@ 2009-11-24 3:11 Stephen Rothwell
2009-11-24 15:05 ` John W. Linville
0 siblings, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2009-11-24 3:11 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 526 bytes --]
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/ath/ath9k/main.c between commit
54ab040d24904d1fa2c0a6a27936b7c56a4efb24 ("ath9k: set ps_default as
false") from the wireless-current tree and commit
18b6c9a2213d3b6e0212e8b225abf95f7564206a ("ath9k: set ps_default as
false") from the wireless tree.
The commit message of the latter made me use just its version.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: linux-next: manual merge of the wireless tree with the wireless-current tree
2009-11-24 3:11 Stephen Rothwell
@ 2009-11-24 15:05 ` John W. Linville
0 siblings, 0 replies; 28+ messages in thread
From: John W. Linville @ 2009-11-24 15:05 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
On Tue, Nov 24, 2009 at 02:11:41PM +1100, Stephen Rothwell wrote:
> Hi John,
>
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/net/wireless/ath/ath9k/main.c between commit
> 54ab040d24904d1fa2c0a6a27936b7c56a4efb24 ("ath9k: set ps_default as
> false") from the wireless-current tree and commit
> 18b6c9a2213d3b6e0212e8b225abf95f7564206a ("ath9k: set ps_default as
> false") from the wireless tree.
>
> The commit message of the latter made me use just its version.
Yes, that's the correct fix. :-)
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 28+ messages in thread
* linux-next: manual merge of the wireless tree with the wireless-current tree
@ 2009-07-09 1:40 Stephen Rothwell
0 siblings, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2009-07-09 1:40 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, linux-kernel, Hin-Tak Leung, Pascal Terjan
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/zd1211rw/zd_usb.c between a couple of commits from
the wireless-current tree and commit
04755d92e9d150a3f308dd39664f859cc2182536 ("zd1211rw: sort vid/pid pairs
by numerical value") from the wireless tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/wireless/zd1211rw/zd_usb.c
index 0e6e446,2c24dd9..0000000
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@@ -36,58 -36,57 +36,58 @@@
static struct usb_device_id usb_ids[] = {
/* ZD1211 */
+ { USB_DEVICE(0x0105, 0x145f), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x0586, 0x3401), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x0586, 0x3402), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x0586, 0x3407), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x0586, 0x3409), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x079b, 0x004a), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x07b8, 0x6001), .driver_info = DEVICE_ZD1211 },
{ USB_DEVICE(0x0ace, 0x1211), .driver_info = DEVICE_ZD1211 },
{ USB_DEVICE(0x0ace, 0xa211), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x126f, 0xa006), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x6891, 0xa727), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x0b05, 0x170c), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x0b3b, 0x1630), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x0b3b, 0x5630), .driver_info = DEVICE_ZD1211 },
{ USB_DEVICE(0x0df6, 0x9071), .driver_info = DEVICE_ZD1211 },
{ USB_DEVICE(0x0df6, 0x9075), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x157e, 0x300b), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x079b, 0x004a), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x1740, 0x2000), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x157e, 0x3204), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x0586, 0x3402), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x0b3b, 0x5630), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x0b05, 0x170c), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x126f, 0xa006), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x129b, 0x1666), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x13b1, 0x001e), .driver_info = DEVICE_ZD1211 },
{ USB_DEVICE(0x1435, 0x0711), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x0586, 0x3409), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x0b3b, 0x1630), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x0586, 0x3401), .driver_info = DEVICE_ZD1211 },
{ USB_DEVICE(0x14ea, 0xab13), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x13b1, 0x001e), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x0586, 0x3407), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x129b, 0x1666), .driver_info = DEVICE_ZD1211 },
{ USB_DEVICE(0x157e, 0x300a), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x0105, 0x145f), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x157e, 0x300b), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x157e, 0x3204), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x1740, 0x2000), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x6891, 0xa727), .driver_info = DEVICE_ZD1211 },
/* ZD1211B */
+ { USB_DEVICE(0x0053, 0x5301), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x0411, 0x00da), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x0471, 0x1236), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x0471, 0x1237), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x050d, 0x705c), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x054c, 0x0257), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x0ace, 0x1215), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x0ace, 0xb215), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x157e, 0x300d), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x0586, 0x340a), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x0586, 0x340f), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x0586, 0x3410), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x0586, 0x3412), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x0586, 0x3413), .driver_info = DEVICE_ZD1211B },
{ USB_DEVICE(0x079b, 0x0062), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x1582, 0x6003), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x050d, 0x705c), .driver_info = DEVICE_ZD1211B },
++ { USB_DEVICE(0x07b8, 0x6001), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x07fa, 0x1196), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x083a, 0x4505), .driver_info = DEVICE_ZD1211B },
{ USB_DEVICE(0x083a, 0xe503), .driver_info = DEVICE_ZD1211B },
{ USB_DEVICE(0x083a, 0xe506), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x083a, 0x4505), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x0471, 0x1236), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x13b1, 0x0024), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x0586, 0x340f), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x0ace, 0x1215), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x0ace, 0xb215), .driver_info = DEVICE_ZD1211B },
{ USB_DEVICE(0x0b05, 0x171b), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x0586, 0x3410), .driver_info = DEVICE_ZD1211B },
{ USB_DEVICE(0x0baf, 0x0121), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x0586, 0x3412), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x0586, 0x3413), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x0053, 0x5301), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x0411, 0x00da), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x2019, 0x5303), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x129b, 0x1667), .driver_info = DEVICE_ZD1211B },
{ USB_DEVICE(0x0cde, 0x001a), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x0586, 0x340a), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x0471, 0x1237), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x07fa, 0x1196), .driver_info = DEVICE_ZD1211B },
{ USB_DEVICE(0x0df6, 0x0036), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x07b8, 0x6001), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x129b, 0x1667), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x13b1, 0x0024), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x1582, 0x6003), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x157e, 0x300d), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x2019, 0x5303), .driver_info = DEVICE_ZD1211B },
/* "Driverless" devices that need ejecting */
{ USB_DEVICE(0x0ace, 0x2011), .driver_info = DEVICE_INSTALLER },
{ USB_DEVICE(0x0ace, 0x20ff), .driver_info = DEVICE_INSTALLER },
^ permalink raw reply [flat|nested] 28+ messages in thread* linux-next: manual merge of the wireless tree with the wireless-current tree
@ 2009-04-22 1:32 Stephen Rothwell
2009-04-22 18:23 ` reinette chatre
0 siblings, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2009-04-22 1:32 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, Reinette Chatre, Johannes Berg
[-- Attachment #1: Type: text/plain, Size: 670 bytes --]
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
net/mac80211/pm.c between commit 7d42081a271bd8a82f2100524085c4f029e47717
("mac80211: do not print WARN if config interface") from the
wireless-current tree and commit aa3590f6a8ebc24d38698ffb81fb51e97f03c4f4
("mac80211: add hardware restart function") from the wireless tree.
The latter moved the code (to net/mac80211/util.c:ieee80211_reconfig)
that the former modified. I just used the version in the wireless tree
and will leave you to fix this up when the merge happens.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: linux-next: manual merge of the wireless tree with the wireless-current tree
2009-04-22 1:32 Stephen Rothwell
@ 2009-04-22 18:23 ` reinette chatre
2009-04-22 18:38 ` John W. Linville
0 siblings, 1 reply; 28+ messages in thread
From: reinette chatre @ 2009-04-22 18:23 UTC (permalink / raw)
To: Stephen Rothwell, John W. Linville; +Cc: linux-next, Johannes Berg
John,
On Tue, 2009-04-21 at 18:32 -0700, Stephen Rothwell wrote:
> Hi John,
>
> Today's linux-next merge of the wireless tree got a conflict in
> net/mac80211/pm.c between commit 7d42081a271bd8a82f2100524085c4f029e47717
> ("mac80211: do not print WARN if config interface") from the
> wireless-current tree and commit aa3590f6a8ebc24d38698ffb81fb51e97f03c4f4
> ("mac80211: add hardware restart function") from the wireless tree.
>
> The latter moved the code (to net/mac80211/util.c:ieee80211_reconfig)
> that the former modified. I just used the version in the wireless tree
> and will leave you to fix this up when the merge happens.
I have no idea how merges work upstream but there is a version of the
"mac80211: do not print WARN if config interface" patch [1] that applies
to net/mac80211/util.c:ieee80211_reconfig. Perhaps it will be easiest to
apply that patch after "mac80211: add hardware restart function"?
Reinette
[1] http://marc.info/?l=linux-wireless&m=124026667231209&w=2
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: linux-next: manual merge of the wireless tree with the wireless-current tree
2009-04-22 18:23 ` reinette chatre
@ 2009-04-22 18:38 ` John W. Linville
0 siblings, 0 replies; 28+ messages in thread
From: John W. Linville @ 2009-04-22 18:38 UTC (permalink / raw)
To: reinette chatre; +Cc: Stephen Rothwell, linux-next, Johannes Berg
On Wed, Apr 22, 2009 at 11:23:46AM -0700, reinette chatre wrote:
> John,
>
> On Tue, 2009-04-21 at 18:32 -0700, Stephen Rothwell wrote:
> > Hi John,
> >
> > Today's linux-next merge of the wireless tree got a conflict in
> > net/mac80211/pm.c between commit 7d42081a271bd8a82f2100524085c4f029e47717
> > ("mac80211: do not print WARN if config interface") from the
> > wireless-current tree and commit aa3590f6a8ebc24d38698ffb81fb51e97f03c4f4
> > ("mac80211: add hardware restart function") from the wireless tree.
> >
> > The latter moved the code (to net/mac80211/util.c:ieee80211_reconfig)
> > that the former modified. I just used the version in the wireless tree
> > and will leave you to fix this up when the merge happens.
>
> I have no idea how merges work upstream but there is a version of the
> "mac80211: do not print WARN if config interface" patch [1] that applies
> to net/mac80211/util.c:ieee80211_reconfig. Perhaps it will be easiest to
> apply that patch after "mac80211: add hardware restart function"?
That doesn't really resolve the conflict. It is, however, helpful
as a reference to me for how to resolve it.
Thanks,
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 28+ messages in thread
* linux-next: manual merge of the wireless tree with the wireless-current tree
@ 2009-02-19 5:27 Stephen Rothwell
0 siblings, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2009-02-19 5:27 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, Bob Copeland, Vasanthakumar Thiagarajan
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/ath9k/main.c between commit
11cb2b00a5f8654102e34df3cfa44992b9c2fc8e ("ath9k: Fix panic upon attach
failure") from the wireless-current tree and commit ath_attach ("ath9k:
move common regulatory code out of if() branches") from the wireless tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/net/wireless/ath9k/main.c
index 7d7537e,1b2c9af..0000000
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@@ -1566,7 -1569,8 +1570,8 @@@ bad
int ath_attach(u16 devid, struct ath_softc *sc)
{
struct ieee80211_hw *hw = sc->hw;
+ const struct ieee80211_regdomain *regd;
- int error = 0;
+ int error = 0, i;
DPRINTF(sc, ATH_DBG_CONFIG, "Attach ATH hw\n");
^ permalink raw reply [flat|nested] 28+ messages in thread
end of thread, other threads:[~2011-09-28 9:10 UTC | newest]
Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-04-05 2:21 linux-next: manual merge of the wireless tree with the wireless-current tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2011-09-28 3:19 Stephen Rothwell
2011-09-28 9:10 ` Jouni Malinen
2011-09-28 9:10 ` Jouni Malinen
2011-09-14 3:05 Stephen Rothwell
2011-06-21 1:49 Stephen Rothwell
2011-06-21 18:05 ` Gustavo F. Padovan
2011-04-05 2:21 Stephen Rothwell
2010-12-14 2:22 Stephen Rothwell
2010-08-30 1:58 Stephen Rothwell
2010-04-09 1:05 Stephen Rothwell
2010-04-07 2:58 Stephen Rothwell
2010-04-07 14:44 ` John W. Linville
2010-04-07 15:31 ` Stephen Rothwell
2010-04-07 23:19 ` David Miller
2010-04-01 1:59 Stephen Rothwell
2010-04-01 11:43 ` John W. Linville
2010-03-11 2:15 Stephen Rothwell
2010-03-11 2:38 ` Bruno Randolf
2010-03-11 3:04 ` Stephen Rothwell
2010-02-23 1:26 Stephen Rothwell
2009-11-24 3:11 Stephen Rothwell
2009-11-24 15:05 ` John W. Linville
2009-07-09 1:40 Stephen Rothwell
2009-04-22 1:32 Stephen Rothwell
2009-04-22 18:23 ` reinette chatre
2009-04-22 18:38 ` John W. Linville
2009-02-19 5:27 Stephen Rothwell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.