diff for duplicates of <20080818151551.GA5524@tuxdriver.com> diff --git a/a/1.txt b/N1/1.txt index 7d97ac0..258f500 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,28 +1,25 @@ On Sun, Aug 17, 2008 at 03:12:51PM -0700, David Miller wrote: > Two commits in here need a fixup. ->=20 +> > Their commit messages reference SHA IDs but do not give a commit > header line text reference as well. ->=20 +> > p54: Fix regression due to commit b19fa1f > ath5k: Don't fiddle with MSI on suspend/resume. ->=20 +> > Please fix this up and give me another pull request, thanks! Dave, -(Revision 2, commit references in changelogs augmented w/ subject text.= -) +(Revision 2, commit references in changelogs augmented w/ subject text.) -Here is the latest round of wireless fixes for 2.6.27. The silliest on= -e +Here is the latest round of wireless fixes for 2.6.27. The silliest one is the one from Adrian Bunk, which applies the gcc-related fix to ath9k again because there were two identical pieces of code to fix -- I guess I didn't get the joke *facepalm*... -I don't think there is anything else remarkable, although I think we fi= -x +I don't think there is anything else remarkable, although I think we fix a couple of the current regressions on LKML. Thanks, @@ -37,22 +34,19 @@ Individual patches are available here: --- -The following changes since commit 23197916c447a1623d196e6547781180905f= -0bb2: +The following changes since commit 23197916c447a1623d196e6547781180905f0bb2: Matt Carlson (1): tg3: Update version to 3.94 are available in the git repository at: - git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.g= -it master + git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git master Adrian Bunk (1): ath9k: work around gcc ICEs (again) Christian Lamparter (3): - p54: Fix regression due to "net: Delete NETDEVICES_MULTIQUEUE kco= -nfig option" + p54: Fix regression due to "net: Delete NETDEVICES_MULTIQUEUE kconfig option" p54: move p54_vdcf_init to the right place. p54u: reset skb's data/tail pointer on requeue @@ -73,12 +67,10 @@ Jochen Friedrich (1): Larry Finger (2): b43: Fix for SPROM coding error in Linksys WMP54G (BCM4306/3) - b43: Fix for another Bluetooth Coexistence SPROM Programming erro= -r for BCM4306 + b43: Fix for another Bluetooth Coexistence SPROM Programming error for BCM4306 Luis R. Rodriguez (1): - mac80211: remove kdoc references to IEEE80211_HW_HOST_GEN_BEACON_= -TEMPLATE + mac80211: remove kdoc references to IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE Michael Karcher (1): ath5k: Don't fiddle with MSI on suspend/resume. @@ -86,7 +78,7 @@ Michael Karcher (1): Ron Rindjunsky (1): mac80211: update new sta's rx timestamp -matthieu Barth=E9lemy (1): +matthieu Barthélemy (1): rtl8187: Add USB ID for Netgear WG111V3 Documentation/rfkill.txt | 5 +++ @@ -106,8 +98,7 @@ matthieu Barth=E9lemy (1): drivers/net/wireless/iwlwifi/iwl-sta.c | 4 +- drivers/net/wireless/iwlwifi/iwl-tx.c | 4 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 7 ++-- - drivers/net/wireless/p54/p54common.c | 51 ++++++++++++++-----= -------- + drivers/net/wireless/p54/p54common.c | 51 ++++++++++++++------------ drivers/net/wireless/p54/p54common.h | 18 +++++----- drivers/net/wireless/p54/p54usb.c | 10 +++++ drivers/net/wireless/rt2x00/rt2x00queue.h | 8 ++-- @@ -123,40 +114,33 @@ diff --git a/Documentation/rfkill.txt b/Documentation/rfkill.txt index 28b6ec8..6fcb306 100644 --- a/Documentation/rfkill.txt +++ b/Documentation/rfkill.txt -@@ -363,6 +363,11 @@ This rule exists because users of the rfkill subsy= -stem expect to get (and set, - when possible) the overall transmitter rfkill state, not of a particul= -ar rfkill +@@ -363,6 +363,11 @@ This rule exists because users of the rfkill subsystem expect to get (and set, + when possible) the overall transmitter rfkill state, not of a particular rfkill line. -=20 -+5. During suspend, the rfkill class will attempt to soft-block the rad= -io -+through a call to rfkill->toggle_radio, and will try to restore its pr= -evious -+state during resume. After a rfkill class is suspended, it will *not*= - call + ++5. During suspend, the rfkill class will attempt to soft-block the radio ++through a call to rfkill->toggle_radio, and will try to restore its previous ++state during resume. After a rfkill class is suspended, it will *not* call +rfkill->toggle_radio until it is resumed. + Example of a WLAN wireless driver connected to the rfkill subsystem: -------------------------------------------------------------------- -=20 -diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/a= -th5k/base.c + +diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c index 2028866..b20a45a 100644 --- a/drivers/net/wireless/ath5k/base.c +++ b/drivers/net/wireless/ath5k/base.c @@ -40,7 +40,6 @@ * */ -=20 + -#include <linux/version.h> #include <linux/module.h> #include <linux/delay.h> #include <linux/hardirq.h> -@@ -587,7 +586,6 @@ ath5k_pci_suspend(struct pci_dev *pdev, pm_message_= -t state) +@@ -587,7 +586,6 @@ ath5k_pci_suspend(struct pci_dev *pdev, pm_message_t state) ath5k_stop_hw(sc); -=20 + free_irq(pdev->irq, sc); - pci_disable_msi(pdev); pci_save_state(pdev); @@ -165,17 +149,17 @@ t state) @@ -616,12 +614,10 @@ ath5k_pci_resume(struct pci_dev *pdev) */ pci_write_config_byte(pdev, 0x41, 0); -=20 + - pci_enable_msi(pdev); - - err =3D request_irq(pdev->irq, ath5k_intr, IRQF_SHARED, "ath", sc); + err = request_irq(pdev->irq, ath5k_intr, IRQF_SHARED, "ath", sc); if (err) { ATH5K_ERR(sc, "request_irq failed\n"); - goto err_msi; + goto err_no_irq; } -=20 - err =3D ath5k_init(sc); + + err = ath5k_init(sc); @@ -642,8 +638,7 @@ ath5k_pci_resume(struct pci_dev *pdev) return 0; err_irq: @@ -186,27 +170,24 @@ t state) pci_disable_device(pdev); return err; } -diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath= -9k/hw.c +diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c index bde162f..a17eb13 100644 --- a/drivers/net/wireless/ath9k/hw.c +++ b/drivers/net/wireless/ath9k/hw.c -@@ -5017,7 +5017,11 @@ static void ath9k_hw_spur_mitigate(struct ath_ha= -l *ah, -=20 - for (i =3D 0; i < 123; i++) { +@@ -5017,7 +5017,11 @@ static void ath9k_hw_spur_mitigate(struct ath_hal *ah, + + for (i = 0; i < 123; i++) { if ((cur_vit_mask > lower) && (cur_vit_mask < upper)) { - if ((abs(cur_vit_mask - bin)) < 75) + + /* workaround for gcc bug #37014 */ -+ volatile int tmp =3D abs(cur_vit_mask - bin); ++ volatile int tmp = abs(cur_vit_mask - bin); + + if (tmp < 75) - mask_amt =3D 1; + mask_amt = 1; else - mask_amt =3D 0; -diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43= -/main.c + mask_amt = 0; +diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 3bf3a86..7205a93 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -219,17 +200,16 @@ index 3bf3a86..7205a93 100644 #include <linux/wireless.h> #include <linux/workqueue.h> @@ -4615,7 +4614,9 @@ static void b43_sprom_fixup(struct ssb_bus *bus) - if (bus->bustype =3D=3D SSB_BUSTYPE_PCI) { - pdev =3D bus->host_pci; + if (bus->bustype == SSB_BUSTYPE_PCI) { + pdev = bus->host_pci; if (IS_PDEV(pdev, BROADCOM, 0x4318, ASUSTEK, 0x100F) || + IS_PDEV(pdev, BROADCOM, 0x4320, DELL, 0x0003) || IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0015) || + IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0014) || IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0013)) - bus->sprom.boardflags_lo &=3D ~B43_BFL_BTCOEXIST; + bus->sprom.boardflags_lo &= ~B43_BFL_BTCOEXIST; } -diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2= -100.c +diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c index c6f886e..19a401c 100644 --- a/drivers/net/wireless/ipw2100.c +++ b/drivers/net/wireless/ipw2100.c @@ -241,170 +221,155 @@ index c6f886e..19a401c 100644 #include <linux/time.h> #include <linux/firmware.h> #include <linux/acpi.h> -diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2= -200.c +diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index 36e8d2f..dcce354 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c @@ -31,7 +31,6 @@ - **********************************************************************= -********/ -=20 + ******************************************************************************/ + #include "ipw2200.h" -#include <linux/version.h> -=20 -=20 + + #ifndef KBUILD_EXTMOD -diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wire= -less/iwlwifi/iwl-3945.c +diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index b3931f6..3f51f36 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c @@ -26,7 +26,6 @@ -=20 + #include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> #include <linux/pci.h> #include <linux/dma-mapping.h> -diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wire= -less/iwlwifi/iwl-4965.c +diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 22bb269..e258122 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c @@ -26,7 +26,6 @@ -=20 + #include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> #include <linux/pci.h> #include <linux/dma-mapping.h> -@@ -967,7 +966,7 @@ static int iwl4965_interpolate_chan(struct iwl_priv= - *priv, u32 channel, -=20 - s =3D iwl4965_get_sub_band(priv, channel); - if (s >=3D EEPROM_TX_POWER_BANDS) { +@@ -967,7 +966,7 @@ static int iwl4965_interpolate_chan(struct iwl_priv *priv, u32 channel, + + s = iwl4965_get_sub_band(priv, channel); + if (s >= EEPROM_TX_POWER_BANDS) { - IWL_ERROR("Tx Power can not find channel %d ", channel); + IWL_ERROR("Tx Power can not find channel %d\n", channel); return -1; } -=20 -diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wire= -less/iwlwifi/iwl-5000.c + +diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index f3d139b..cbc01a0 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c @@ -25,7 +25,6 @@ -=20 + #include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> #include <linux/pci.h> #include <linux/dma-mapping.h> -diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wirel= -ess/iwlwifi/iwl-agn.c +diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index ed09e48..061ffba 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -29,7 +29,6 @@ -=20 + #include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> #include <linux/pci.h> #include <linux/dma-mapping.h> -diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wire= -less/iwlwifi/iwl-core.c +diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 9bd6180..c72f725 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c @@ -28,7 +28,6 @@ -=20 + #include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <net/mac80211.h> -=20 + struct iwl_priv; /* FIXME: remove */ -diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wi= -reless/iwlwifi/iwl-eeprom.c +diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c index bce5383..3715575 100644 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c @@ -63,7 +63,6 @@ -=20 + #include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> -=20 + #include <net/mac80211.h> -@@ -146,7 +145,7 @@ int iwlcore_eeprom_verify_signature(struct iwl_priv= - *priv) +@@ -146,7 +145,7 @@ int iwlcore_eeprom_verify_signature(struct iwl_priv *priv) { - u32 gp =3D iwl_read32(priv, CSR_EEPROM_GP); - if ((gp & CSR_EEPROM_GP_VALID_MSK) =3D=3D CSR_EEPROM_GP_BAD_SIGNATURE= -) { -- IWL_ERROR("EEPROM not found, EEPROM_GP=3D0x%08x", gp); -+ IWL_ERROR("EEPROM not found, EEPROM_GP=3D0x%08x\n", gp); + u32 gp = iwl_read32(priv, CSR_EEPROM_GP); + if ((gp & CSR_EEPROM_GP_VALID_MSK) == CSR_EEPROM_GP_BAD_SIGNATURE) { +- IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x", gp); ++ IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x\n", gp); return -ENOENT; } return 0; @@ -227,7 +226,7 @@ int iwl_eeprom_init(struct iwl_priv *priv) -=20 - ret =3D priv->cfg->ops->lib->eeprom_ops.verify_signature(priv); + + ret = priv->cfg->ops->lib->eeprom_ops.verify_signature(priv); if (ret < 0) { -- IWL_ERROR("EEPROM not found, EEPROM_GP=3D0x%08x", gp); -+ IWL_ERROR("EEPROM not found, EEPROM_GP=3D0x%08x\n", gp); - ret =3D -ENOENT; +- IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x", gp); ++ IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x\n", gp); + ret = -ENOENT; goto err; } @@ -254,7 +253,7 @@ int iwl_eeprom_init(struct iwl_priv *priv) } -=20 + if (!(r & CSR_EEPROM_REG_READ_VALID_MSK)) { - IWL_ERROR("Time out reading EEPROM[%d]", addr); + IWL_ERROR("Time out reading EEPROM[%d]\n", addr); - ret =3D -ETIMEDOUT; + ret = -ETIMEDOUT; goto done; } -diff --git a/drivers/net/wireless/iwlwifi/iwl-hcmd.c b/drivers/net/wire= -less/iwlwifi/iwl-hcmd.c +diff --git a/drivers/net/wireless/iwlwifi/iwl-hcmd.c b/drivers/net/wireless/iwlwifi/iwl-hcmd.c index 6512834..2eb03ee 100644 --- a/drivers/net/wireless/iwlwifi/iwl-hcmd.c +++ b/drivers/net/wireless/iwlwifi/iwl-hcmd.c @@ -28,7 +28,6 @@ -=20 + #include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <net/mac80211.h> -=20 + #include "iwl-dev.h" /* FIXME: remove */ -diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wir= -eless/iwlwifi/iwl-power.c +diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c index 028e305..a099c9e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-power.c +++ b/drivers/net/wireless/iwlwifi/iwl-power.c @@ -29,7 +29,6 @@ -=20 + #include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> -=20 + #include <net/mac80211.h> -diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wirel= -ess/iwlwifi/iwl-sta.c +diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c index 60a6e01..6283a3a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-sta.c -@@ -207,7 +207,7 @@ static void iwl_set_ht_add_station(struct iwl_priv = -*priv, u8 index, +@@ -207,7 +207,7 @@ static void iwl_set_ht_add_station(struct iwl_priv *priv, u8 index, case WLAN_HT_CAP_MIMO_PS_DISABLED: break; default: @@ -412,165 +377,152 @@ index 60a6e01..6283a3a 100644 + IWL_WARNING("Invalid MIMO PS mode %d\n", mimo_ps_mode); break; } -=20 -@@ -969,7 +969,7 @@ int iwl_get_sta_id(struct iwl_priv *priv, struct ie= -ee80211_hdr *hdr) + +@@ -969,7 +969,7 @@ int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr) return priv->hw_params.bcast_sta_id; -=20 + default: - IWL_WARNING("Unknown mode of operation: %d", priv->iw_mode); + IWL_WARNING("Unknown mode of operation: %d\n", priv->iw_mode); return priv->hw_params.bcast_sta_id; } } -diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wirele= -ss/iwlwifi/iwl-tx.c +diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c index 4108c7c..d82823b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-tx.c @@ -493,7 +493,7 @@ int iwl_txq_ctx_reset(struct iwl_priv *priv) /* Alloc keep-warm buffer */ - ret =3D iwl_kw_alloc(priv); + ret = iwl_kw_alloc(priv); if (ret) { - IWL_ERROR("Keep Warm allocation failed"); + IWL_ERROR("Keep Warm allocation failed\n"); goto error_kw; } spin_lock_irqsave(&priv->lock, flags); -@@ -1463,7 +1463,7 @@ void iwl_rx_reply_compressed_ba(struct iwl_priv *= -priv, - u16 ba_resp_scd_ssn =3D le16_to_cpu(ba_resp->scd_ssn); -=20 - if (scd_flow >=3D priv->hw_params.max_txq_num) { +@@ -1463,7 +1463,7 @@ void iwl_rx_reply_compressed_ba(struct iwl_priv *priv, + u16 ba_resp_scd_ssn = le16_to_cpu(ba_resp->scd_ssn); + + if (scd_flow >= priv->hw_params.max_txq_num) { - IWL_ERROR("BUG_ON scd_flow is bigger than number of queues"); + IWL_ERROR("BUG_ON scd_flow is bigger than number of queues\n"); return; } -=20 -diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/= -wireless/iwlwifi/iwl3945-base.c + +diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 444847a..b775d5b 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -29,7 +29,6 @@ -=20 + #include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> #include <linux/pci.h> #include <linux/dma-mapping.h> -@@ -1558,7 +1557,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv= -) - BUILD_BUG_ON(sizeof(priv->eeprom) !=3D IWL_EEPROM_IMAGE_SIZE); -=20 - if ((gp & CSR_EEPROM_GP_VALID_MSK) =3D=3D CSR_EEPROM_GP_BAD_SIGNATURE= -) { -- IWL_ERROR("EEPROM not found, EEPROM_GP=3D0x%08x", gp); -+ IWL_ERROR("EEPROM not found, EEPROM_GP=3D0x%08x\n", gp); +@@ -1558,7 +1557,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv) + BUILD_BUG_ON(sizeof(priv->eeprom) != IWL_EEPROM_IMAGE_SIZE); + + if ((gp & CSR_EEPROM_GP_VALID_MSK) == CSR_EEPROM_GP_BAD_SIGNATURE) { +- IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x", gp); ++ IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x\n", gp); return -ENOENT; } -=20 -@@ -1583,7 +1582,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv= -) + +@@ -1583,7 +1582,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv) } -=20 + if (!(r & CSR_EEPROM_REG_READ_VALID_MSK)) { - IWL_ERROR("Time out reading EEPROM[%d]", addr); + IWL_ERROR("Time out reading EEPROM[%d]\n", addr); return -ETIMEDOUT; } - e[addr / 2] =3D le16_to_cpu((__force __le16)(r >> 16)); -@@ -2507,7 +2506,7 @@ static int iwl3945_get_sta_id(struct iwl3945_priv= - *priv, struct ieee80211_hdr *h + e[addr / 2] = le16_to_cpu((__force __le16)(r >> 16)); +@@ -2507,7 +2506,7 @@ static int iwl3945_get_sta_id(struct iwl3945_priv *priv, struct ieee80211_hdr *h return priv->hw_setting.bcast_sta_id; -=20 + default: - IWL_WARNING("Unknown mode of operation: %d", priv->iw_mode); + IWL_WARNING("Unknown mode of operation: %d\n", priv->iw_mode); return priv->hw_setting.bcast_sta_id; } } -diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireles= -s/p54/p54common.c +diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c index 83cd85e..29be3dc 100644 --- a/drivers/net/wireless/p54/p54common.c +++ b/drivers/net/wireless/p54/p54common.c -@@ -413,12 +413,12 @@ static void p54_rx_frame_sent(struct ieee80211_hw= - *dev, struct sk_buff *skb) - last_addr =3D range->end_addr; +@@ -413,12 +413,12 @@ static void p54_rx_frame_sent(struct ieee80211_hw *dev, struct sk_buff *skb) + last_addr = range->end_addr; __skb_unlink(entry, &priv->tx_queue); memset(&info->status, 0, sizeof(info->status)); - priv->tx_stats[skb_get_queue_mapping(skb)].len--; - entry_hdr =3D (struct p54_control_hdr *) entry->data; - entry_data =3D (struct p54_tx_control_allocdata *) entry_hdr->data; - if ((entry_hdr->magic1 & cpu_to_le16(0x4000)) !=3D 0) - pad =3D entry_data->align[0]; -=20 + entry_hdr = (struct p54_control_hdr *) entry->data; + entry_data = (struct p54_tx_control_allocdata *) entry_hdr->data; + if ((entry_hdr->magic1 & cpu_to_le16(0x4000)) != 0) + pad = entry_data->align[0]; + + priv->tx_stats[entry_data->hw_queue - 4].len--; if (!(info->flags & IEEE80211_TX_CTL_NO_ACK)) { if (!(payload->status & 0x01)) - info->flags |=3D IEEE80211_TX_STAT_ACK; -@@ -557,6 +557,7 @@ static int p54_tx(struct ieee80211_hw *dev, struct = -sk_buff *skb) + info->flags |= IEEE80211_TX_STAT_ACK; +@@ -557,6 +557,7 @@ static int p54_tx(struct ieee80211_hw *dev, struct sk_buff *skb) struct p54_tx_control_allocdata *txhdr; size_t padding, len; u8 rate; -+ u8 cts_rate =3D 0x20; -=20 - current_queue =3D &priv->tx_stats[skb_get_queue_mapping(skb)]; ++ u8 cts_rate = 0x20; + + current_queue = &priv->tx_stats[skb_get_queue_mapping(skb)]; if (unlikely(current_queue->len > current_queue->limit)) -@@ -581,28 +582,28 @@ static int p54_tx(struct ieee80211_hw *dev, struc= -t sk_buff *skb) - hdr->type =3D (info->flags & IEEE80211_TX_CTL_NO_ACK) ? 0 : cpu_to_le= -16(1); - hdr->retry1 =3D hdr->retry2 =3D info->control.retry_limit; -=20 +@@ -581,28 +582,28 @@ static int p54_tx(struct ieee80211_hw *dev, struct sk_buff *skb) + hdr->type = (info->flags & IEEE80211_TX_CTL_NO_ACK) ? 0 : cpu_to_le16(1); + hdr->retry1 = hdr->retry2 = info->control.retry_limit; + - memset(txhdr->wep_key, 0x0, 16); -- txhdr->padding =3D 0; -- txhdr->padding2 =3D 0; +- txhdr->padding = 0; +- txhdr->padding2 = 0; - /* TODO: add support for alternate retry TX rates */ - rate =3D ieee80211_get_tx_rate(dev, info)->hw_value; + rate = ieee80211_get_tx_rate(dev, info)->hw_value; - if (info->flags & IEEE80211_TX_CTL_SHORT_PREAMBLE) + if (info->flags & IEEE80211_TX_CTL_SHORT_PREAMBLE) { - rate |=3D 0x10; + rate |= 0x10; - if (info->flags & IEEE80211_TX_CTL_USE_RTS_CTS) -+ cts_rate |=3D 0x10; ++ cts_rate |= 0x10; + } + if (info->flags & IEEE80211_TX_CTL_USE_RTS_CTS) { - rate |=3D 0x40; + rate |= 0x40; - else if (info->flags & IEEE80211_TX_CTL_USE_CTS_PROTECT) -+ cts_rate |=3D ieee80211_get_rts_cts_rate(dev, info)->hw_value; ++ cts_rate |= ieee80211_get_rts_cts_rate(dev, info)->hw_value; + } else if (info->flags & IEEE80211_TX_CTL_USE_CTS_PROTECT) { - rate |=3D 0x20; -+ cts_rate |=3D ieee80211_get_rts_cts_rate(dev, info)->hw_value; + rate |= 0x20; ++ cts_rate |= ieee80211_get_rts_cts_rate(dev, info)->hw_value; + } memset(txhdr->rateset, rate, 8); -- txhdr->wep_key_present =3D 0; -- txhdr->wep_key_len =3D 0; -- txhdr->frame_type =3D cpu_to_le32(skb_get_queue_mapping(skb) + 4); -- txhdr->magic4 =3D 0; -- txhdr->antenna =3D (info->antenna_sel_tx =3D=3D 0) ? -+ txhdr->key_type =3D 0; -+ txhdr->key_len =3D 0; -+ txhdr->hw_queue =3D skb_get_queue_mapping(skb) + 4; -+ txhdr->tx_antenna =3D (info->antenna_sel_tx =3D=3D 0) ? +- txhdr->wep_key_present = 0; +- txhdr->wep_key_len = 0; +- txhdr->frame_type = cpu_to_le32(skb_get_queue_mapping(skb) + 4); +- txhdr->magic4 = 0; +- txhdr->antenna = (info->antenna_sel_tx == 0) ? ++ txhdr->key_type = 0; ++ txhdr->key_len = 0; ++ txhdr->hw_queue = skb_get_queue_mapping(skb) + 4; ++ txhdr->tx_antenna = (info->antenna_sel_tx == 0) ? 2 : info->antenna_sel_tx - 1; - txhdr->output_power =3D 0x7f; // HW Maximum -- txhdr->magic5 =3D (info->flags & IEEE80211_TX_CTL_NO_ACK) ? + txhdr->output_power = 0x7f; // HW Maximum +- txhdr->magic5 = (info->flags & IEEE80211_TX_CTL_NO_ACK) ? - 0 : ((rate > 0x3) ? cpu_to_le32(0x33) : cpu_to_le32(0x23)); -+ txhdr->cts_rate =3D (info->flags & IEEE80211_TX_CTL_NO_ACK) ? ++ txhdr->cts_rate = (info->flags & IEEE80211_TX_CTL_NO_ACK) ? + 0 : cts_rate; if (padding) - txhdr->align[0] =3D padding; -=20 + txhdr->align[0] = padding; + @@ -836,10 +837,21 @@ static int p54_start(struct ieee80211_hw *dev) - struct p54_common *priv =3D dev->priv; + struct p54_common *priv = dev->priv; int err; -=20 + + if (!priv->cached_vdcf) { -+ priv->cached_vdcf =3D kzalloc(sizeof(struct p54_tx_control_vdcf)+ ++ priv->cached_vdcf = kzalloc(sizeof(struct p54_tx_control_vdcf)+ + priv->tx_hdr_len + sizeof(struct p54_control_hdr), + GFP_KERNEL); + @@ -578,24 +530,21 @@ t sk_buff *skb) + return -ENOMEM; + } + - err =3D priv->open(dev); + err = priv->open(dev); if (!err) - priv->mode =3D IEEE80211_IF_TYPE_MNTR; -=20 + priv->mode = IEEE80211_IF_TYPE_MNTR; + + p54_init_vdcf(dev); + return err; } -=20 -@@ -1019,15 +1031,6 @@ struct ieee80211_hw *p54_init_common(size_t priv= -_data_len) - dev->extra_tx_headroom =3D sizeof(struct p54_control_hdr) + 4 + + +@@ -1019,15 +1031,6 @@ struct ieee80211_hw *p54_init_common(size_t priv_data_len) + dev->extra_tx_headroom = sizeof(struct p54_control_hdr) + 4 + sizeof(struct p54_tx_control_allocdata); -=20 -- priv->cached_vdcf =3D kzalloc(sizeof(struct p54_tx_control_vdc= -f) + -- priv->tx_hdr_len + sizeof(struct p54_control_hdr), GFP_K= -ERNEL); + +- priv->cached_vdcf = kzalloc(sizeof(struct p54_tx_control_vdcf) + +- priv->tx_hdr_len + sizeof(struct p54_control_hdr), GFP_KERNEL); - - if (!priv->cached_vdcf) { - ieee80211_free_hw(dev); @@ -604,15 +553,14 @@ ERNEL); - - p54_init_vdcf(dev); mutex_init(&priv->conf_mutex); -=20 + return dev; -diff --git a/drivers/net/wireless/p54/p54common.h b/drivers/net/wireles= -s/p54/p54common.h +diff --git a/drivers/net/wireless/p54/p54common.h b/drivers/net/wireless/p54/p54common.h index 2245fcc..8db6c0e 100644 --- a/drivers/net/wireless/p54/p54common.h +++ b/drivers/net/wireless/p54/p54common.h @@ -183,16 +183,16 @@ struct p54_frame_sent_hdr { -=20 + struct p54_tx_control_allocdata { u8 rateset[8]; - u16 padding; @@ -636,14 +584,13 @@ index 2245fcc..8db6c0e 100644 + u8 unalloc2[3]; u8 align[0]; } __attribute__ ((packed)); -=20 -diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p= -54/p54usb.c + +diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c index 815c095..cbaca23 100644 --- a/drivers/net/wireless/p54/p54usb.c +++ b/drivers/net/wireless/p54/p54usb.c @@ -109,7 +109,17 @@ static void p54u_rx_cb(struct urb *urb) - urb->context =3D skb; + urb->context = skb; skb_queue_tail(&priv->rx_queue, skb); } else { + if (!priv->hw_type) @@ -651,17 +598,16 @@ index 815c095..cbaca23 100644 + + skb_reset_tail_pointer(skb); skb_trim(skb, 0); -+ if (urb->transfer_buffer !=3D skb_tail_pointer(skb)) { ++ if (urb->transfer_buffer != skb_tail_pointer(skb)) { + /* this should not happen */ + WARN_ON(1); -+ urb->transfer_buffer =3D skb_tail_pointer(skb); ++ urb->transfer_buffer = skb_tail_pointer(skb); + } + skb_queue_tail(&priv->rx_queue, skb); } -=20 -diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wi= -reless/rt2x00/rt2x00queue.h + +diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wireless/rt2x00/rt2x00queue.h index a4a8c57..ff78e52 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.h +++ b/drivers/net/wireless/rt2x00/rt2x00queue.h @@ -669,71 +615,66 @@ index a4a8c57..ff78e52 100644 * frame transmission failed due to excessive retries. */ enum txdone_entry_desc_flags { -- TXDONE_UNKNOWN =3D 1 << 0, -- TXDONE_SUCCESS =3D 1 << 1, -- TXDONE_FAILURE =3D 1 << 2, -- TXDONE_EXCESSIVE_RETRY =3D 1 << 3, +- TXDONE_UNKNOWN = 1 << 0, +- TXDONE_SUCCESS = 1 << 1, +- TXDONE_FAILURE = 1 << 2, +- TXDONE_EXCESSIVE_RETRY = 1 << 3, + TXDONE_UNKNOWN, + TXDONE_SUCCESS, + TXDONE_FAILURE, + TXDONE_EXCESSIVE_RETRY, }; -=20 + /** -diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wire= -less/rt2x00/rt2x00usb.c +diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c index 8d76bb2..2050227 100644 --- a/drivers/net/wireless/rt2x00/rt2x00usb.c +++ b/drivers/net/wireless/rt2x00/rt2x00usb.c -@@ -181,6 +181,7 @@ static void rt2x00usb_interrupt_txdone(struct urb *= -urb) +@@ -181,6 +181,7 @@ static void rt2x00usb_interrupt_txdone(struct urb *urb) * (Only indirectly by looking at the failed TX counters * in the register). */ -+ txdesc.flags =3D 0; ++ txdesc.flags = 0; if (!urb->status) __set_bit(TXDONE_UNKNOWN, &txdesc.flags); else -diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/= -rtl8187_dev.c +diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c index 57376fb..ca5deb6 100644 --- a/drivers/net/wireless/rtl8187_dev.c +++ b/drivers/net/wireless/rtl8187_dev.c -@@ -40,6 +40,7 @@ static struct usb_device_id rtl8187_table[] __devinit= -data =3D { +@@ -40,6 +40,7 @@ static struct usb_device_id rtl8187_table[] __devinitdata = { /* Netgear */ - {USB_DEVICE(0x0846, 0x6100), .driver_info =3D DEVICE_RTL8187}, - {USB_DEVICE(0x0846, 0x6a00), .driver_info =3D DEVICE_RTL8187}, -+ {USB_DEVICE(0x0846, 0x4260), .driver_info =3D DEVICE_RTL8187B}, + {USB_DEVICE(0x0846, 0x6100), .driver_info = DEVICE_RTL8187}, + {USB_DEVICE(0x0846, 0x6a00), .driver_info = DEVICE_RTL8187}, ++ {USB_DEVICE(0x0846, 0x4260), .driver_info = DEVICE_RTL8187B}, /* HP */ - {USB_DEVICE(0x03f0, 0xca02), .driver_info =3D DEVICE_RTL8187}, + {USB_DEVICE(0x03f0, 0xca02), .driver_info = DEVICE_RTL8187}, /* Sitecom */ diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c index d831a2b..87ab244 100644 --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c @@ -1165,15 +1165,19 @@ EXPORT_SYMBOL(ssb_dma_translation); -=20 + int ssb_dma_set_mask(struct ssb_device *dev, u64 mask) { +#ifdef CONFIG_SSB_PCIHOST int err; +#endif -=20 + switch (dev->bus->bustype) { case SSB_BUSTYPE_PCI: +#ifdef CONFIG_SSB_PCIHOST - err =3D pci_set_dma_mask(dev->bus->host_pci, mask); + err = pci_set_dma_mask(dev->bus->host_pci, mask); if (err) return err; - err =3D pci_set_consistent_dma_mask(dev->bus->host_pci, mask); + err = pci_set_consistent_dma_mask(dev->bus->host_pci, mask); return err; +#endif case SSB_BUSTYPE_SSB: return dma_set_mask(dev->dev, mask); default: -@@ -1188,6 +1192,7 @@ void * ssb_dma_alloc_consistent(struct ssb_device= - *dev, size_t size, +@@ -1188,6 +1192,7 @@ void * ssb_dma_alloc_consistent(struct ssb_device *dev, size_t size, { switch (dev->bus->bustype) { case SSB_BUSTYPE_PCI: @@ -741,8 +682,7 @@ index d831a2b..87ab244 100644 if (gfp_flags & GFP_DMA) { /* Workaround: The PCI API does not support passing * a GFP flag. */ -@@ -1195,6 +1200,7 @@ void * ssb_dma_alloc_consistent(struct ssb_device= - *dev, size_t size, +@@ -1195,6 +1200,7 @@ void * ssb_dma_alloc_consistent(struct ssb_device *dev, size_t size, size, dma_handle, gfp_flags); } return pci_alloc_consistent(dev->bus->host_pci, size, dma_handle); @@ -750,8 +690,7 @@ index d831a2b..87ab244 100644 case SSB_BUSTYPE_SSB: return dma_alloc_coherent(dev->dev, size, dma_handle, gfp_flags); default: -@@ -1210,6 +1216,7 @@ void ssb_dma_free_consistent(struct ssb_device *d= -ev, size_t size, +@@ -1210,6 +1216,7 @@ void ssb_dma_free_consistent(struct ssb_device *dev, size_t size, { switch (dev->bus->bustype) { case SSB_BUSTYPE_PCI: @@ -759,8 +698,7 @@ ev, size_t size, if (gfp_flags & GFP_DMA) { /* Workaround: The PCI API does not support passing * a GFP flag. */ -@@ -1220,6 +1227,7 @@ void ssb_dma_free_consistent(struct ssb_device *d= -ev, size_t size, +@@ -1220,6 +1227,7 @@ void ssb_dma_free_consistent(struct ssb_device *dev, size_t size, pci_free_consistent(dev->bus->host_pci, size, vaddr, dma_handle); return; @@ -783,14 +721,12 @@ index b397e4d..ff137fd 100644 + * the driver can fetch them with ieee80211_get_buffered_bc(). * * @IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE: - * Hardware is not capable of short slot operation on the 2.4 GHz band= -=2E + * Hardware is not capable of short slot operation on the 2.4 GHz band. @@ -1099,10 +1096,8 @@ enum ieee80211_ampdu_mlme_action { * See the section "Frame filtering" for more information. * This callback must be implemented and atomic. * -- * @set_tim: Set TIM bit. If the hardware/firmware takes care of beaco= -n +- * @set_tim: Set TIM bit. If the hardware/firmware takes care of beacon - * generation (that is, %IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE is set) - * mac80211 calls this function when a TIM bit must be set or cleared - * for a given AID. Must be atomic. @@ -803,22 +739,20 @@ diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index e1d11c9..1e97fb9 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c -@@ -2103,6 +2103,8 @@ static void ieee80211_rx_mgmt_assoc_resp(struct i= -eee80211_sub_if_data *sdata, +@@ -2103,6 +2103,8 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, rcu_read_unlock(); return; } + /* update new sta with its last rx activity */ -+ sta->last_rx =3D jiffies; ++ sta->last_rx = jiffies; } -=20 + /* diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c index d2d4565..35a9994 100644 --- a/net/rfkill/rfkill.c +++ b/net/rfkill/rfkill.c -@@ -150,6 +150,8 @@ static void update_rfkill_state(struct rfkill *rfki= -ll) +@@ -150,6 +150,8 @@ static void update_rfkill_state(struct rfkill *rfkill) * calls and handling all the red tape such as issuing notifications * if the call is successful. * @@ -827,19 +761,17 @@ ll) * Note that the @force parameter cannot override a (possibly cached) * state of RFKILL_STATE_HARD_BLOCKED. Any device making use of * RFKILL_STATE_HARD_BLOCKED implements either get_state() or -@@ -168,6 +170,9 @@ static int rfkill_toggle_radio(struct rfkill *rfkil= -l, - int retval =3D 0; +@@ -168,6 +170,9 @@ static int rfkill_toggle_radio(struct rfkill *rfkill, + int retval = 0; enum rfkill_state oldstate, newstate; -=20 + + if (unlikely(rfkill->dev.power.power_state.event & PM_EVENT_SLEEP)) + return -EBUSY; + - oldstate =3D rfkill->state; -=20 + oldstate = rfkill->state; + if (rfkill->get_state && !force && -@@ -214,7 +219,7 @@ static int rfkill_toggle_radio(struct rfkill *rfkil= -l, +@@ -214,7 +219,7 @@ static int rfkill_toggle_radio(struct rfkill *rfkill, * * This function toggles the state of all switches of given type, * unless a specific switch is claimed by userspace (in which case, @@ -852,36 +784,29 @@ l, /** * rfkill_epo - emergency power off all transmitters * -- * This kicks all rfkill devices to RFKILL_STATE_SOFT_BLOCKED, ignorin= -g +- * This kicks all rfkill devices to RFKILL_STATE_SOFT_BLOCKED, ignoring - * everything in its path but rfkill_mutex and rfkill->mutex. -+ * This kicks all non-suspended rfkill devices to RFKILL_STATE_SOFT_BL= -OCKED, ++ * This kicks all non-suspended rfkill devices to RFKILL_STATE_SOFT_BLOCKED, + * ignoring everything in its path but rfkill_mutex and rfkill->mutex. */ void rfkill_epo(void) { @@ -458,13 +463,14 @@ static int rfkill_resume(struct device *dev) - if (dev->power.power_state.event !=3D PM_EVENT_ON) { + if (dev->power.power_state.event != PM_EVENT_ON) { mutex_lock(&rfkill->mutex); -=20 -+ dev->power.power_state.event =3D PM_EVENT_ON; + ++ dev->power.power_state.event = PM_EVENT_ON; + /* restore radio state AND notify everybody */ rfkill_toggle_radio(rfkill, rfkill->state, 1); -=20 + mutex_unlock(&rfkill->mutex); } -=20 -- dev->power.power_state =3D PMSG_ON; + +- dev->power.power_state = PMSG_ON; return 0; } #else ---=20 +-- John W. Linville linville@tuxdriver.com --- -To unsubscribe from this list: send the line "unsubscribe linux-wireles= -s" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 44ecefc..60a7a9c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -12,28 +12,25 @@ "On Sun, Aug 17, 2008 at 03:12:51PM -0700, David Miller wrote:\n" "\n" "> Two commits in here need a fixup.\n" - ">=20\n" + "> \n" "> Their commit messages reference SHA IDs but do not give a commit\n" "> header line text reference as well.\n" - ">=20\n" + "> \n" "> p54: Fix regression due to commit b19fa1f\n" "> ath5k: Don't fiddle with MSI on suspend/resume.\n" - ">=20\n" + "> \n" "> Please fix this up and give me another pull request, thanks!\n" "\n" "Dave,\n" "\n" - "(Revision 2, commit references in changelogs augmented w/ subject text.=\n" - ")\n" + "(Revision 2, commit references in changelogs augmented w/ subject text.)\n" "\n" - "Here is the latest round of wireless fixes for 2.6.27. The silliest on=\n" - "e\n" + "Here is the latest round of wireless fixes for 2.6.27. The silliest one\n" "is the one from Adrian Bunk, which applies the gcc-related fix to ath9k\n" "again because there were two identical pieces of code to fix -- I guess\n" "I didn't get the joke *facepalm*...\n" "\n" - "I don't think there is anything else remarkable, although I think we fi=\n" - "x\n" + "I don't think there is anything else remarkable, although I think we fix\n" "a couple of the current regressions on LKML.\n" "\n" "Thanks,\n" @@ -48,22 +45,19 @@ "\n" "---\n" "\n" - "The following changes since commit 23197916c447a1623d196e6547781180905f=\n" - "0bb2:\n" + "The following changes since commit 23197916c447a1623d196e6547781180905f0bb2:\n" " Matt Carlson (1):\n" " tg3: Update version to 3.94\n" "\n" "are available in the git repository at:\n" "\n" - " git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.g=\n" - "it master\n" + " git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git master\n" "\n" "Adrian Bunk (1):\n" " ath9k: work around gcc ICEs (again)\n" "\n" "Christian Lamparter (3):\n" - " p54: Fix regression due to \"net: Delete NETDEVICES_MULTIQUEUE kco=\n" - "nfig option\"\n" + " p54: Fix regression due to \"net: Delete NETDEVICES_MULTIQUEUE kconfig option\"\n" " p54: move p54_vdcf_init to the right place.\n" " p54u: reset skb's data/tail pointer on requeue\n" "\n" @@ -84,12 +78,10 @@ "\n" "Larry Finger (2):\n" " b43: Fix for SPROM coding error in Linksys WMP54G (BCM4306/3)\n" - " b43: Fix for another Bluetooth Coexistence SPROM Programming erro=\n" - "r for BCM4306\n" + " b43: Fix for another Bluetooth Coexistence SPROM Programming error for BCM4306\n" "\n" "Luis R. Rodriguez (1):\n" - " mac80211: remove kdoc references to IEEE80211_HW_HOST_GEN_BEACON_=\n" - "TEMPLATE\n" + " mac80211: remove kdoc references to IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE\n" "\n" "Michael Karcher (1):\n" " ath5k: Don't fiddle with MSI on suspend/resume.\n" @@ -97,7 +89,7 @@ "Ron Rindjunsky (1):\n" " mac80211: update new sta's rx timestamp\n" "\n" - "matthieu Barth=E9lemy (1):\n" + "matthieu Barth\303\251lemy (1):\n" " rtl8187: Add USB ID for Netgear WG111V3\n" "\n" " Documentation/rfkill.txt | 5 +++\n" @@ -117,8 +109,7 @@ " drivers/net/wireless/iwlwifi/iwl-sta.c | 4 +-\n" " drivers/net/wireless/iwlwifi/iwl-tx.c | 4 +-\n" " drivers/net/wireless/iwlwifi/iwl3945-base.c | 7 ++--\n" - " drivers/net/wireless/p54/p54common.c | 51 ++++++++++++++-----=\n" - "-------\n" + " drivers/net/wireless/p54/p54common.c | 51 ++++++++++++++------------\n" " drivers/net/wireless/p54/p54common.h | 18 +++++-----\n" " drivers/net/wireless/p54/p54usb.c | 10 +++++\n" " drivers/net/wireless/rt2x00/rt2x00queue.h | 8 ++--\n" @@ -134,40 +125,33 @@ "index 28b6ec8..6fcb306 100644\n" "--- a/Documentation/rfkill.txt\n" "+++ b/Documentation/rfkill.txt\n" - "@@ -363,6 +363,11 @@ This rule exists because users of the rfkill subsy=\n" - "stem expect to get (and set,\n" - " when possible) the overall transmitter rfkill state, not of a particul=\n" - "ar rfkill\n" + "@@ -363,6 +363,11 @@ This rule exists because users of the rfkill subsystem expect to get (and set,\n" + " when possible) the overall transmitter rfkill state, not of a particular rfkill\n" " line.\n" - "=20\n" - "+5. During suspend, the rfkill class will attempt to soft-block the rad=\n" - "io\n" - "+through a call to rfkill->toggle_radio, and will try to restore its pr=\n" - "evious\n" - "+state during resume. After a rfkill class is suspended, it will *not*=\n" - " call\n" + " \n" + "+5. During suspend, the rfkill class will attempt to soft-block the radio\n" + "+through a call to rfkill->toggle_radio, and will try to restore its previous\n" + "+state during resume. After a rfkill class is suspended, it will *not* call\n" "+rfkill->toggle_radio until it is resumed.\n" "+\n" " Example of a WLAN wireless driver connected to the rfkill subsystem:\n" " --------------------------------------------------------------------\n" - "=20\n" - "diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/a=\n" - "th5k/base.c\n" + " \n" + "diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c\n" "index 2028866..b20a45a 100644\n" "--- a/drivers/net/wireless/ath5k/base.c\n" "+++ b/drivers/net/wireless/ath5k/base.c\n" "@@ -40,7 +40,6 @@\n" " *\n" " */\n" - "=20\n" + " \n" "-#include <linux/version.h>\n" " #include <linux/module.h>\n" " #include <linux/delay.h>\n" " #include <linux/hardirq.h>\n" - "@@ -587,7 +586,6 @@ ath5k_pci_suspend(struct pci_dev *pdev, pm_message_=\n" - "t state)\n" + "@@ -587,7 +586,6 @@ ath5k_pci_suspend(struct pci_dev *pdev, pm_message_t state)\n" " \tath5k_stop_hw(sc);\n" - "=20\n" + " \n" " \tfree_irq(pdev->irq, sc);\n" "-\tpci_disable_msi(pdev);\n" " \tpci_save_state(pdev);\n" @@ -176,17 +160,17 @@ "@@ -616,12 +614,10 @@ ath5k_pci_resume(struct pci_dev *pdev)\n" " \t */\n" " \tpci_write_config_byte(pdev, 0x41, 0);\n" - "=20\n" + " \n" "-\tpci_enable_msi(pdev);\n" "-\n" - " \terr =3D request_irq(pdev->irq, ath5k_intr, IRQF_SHARED, \"ath\", sc);\n" + " \terr = request_irq(pdev->irq, ath5k_intr, IRQF_SHARED, \"ath\", sc);\n" " \tif (err) {\n" " \t\tATH5K_ERR(sc, \"request_irq failed\\n\");\n" "-\t\tgoto err_msi;\n" "+\t\tgoto err_no_irq;\n" " \t}\n" - "=20\n" - " \terr =3D ath5k_init(sc);\n" + " \n" + " \terr = ath5k_init(sc);\n" "@@ -642,8 +638,7 @@ ath5k_pci_resume(struct pci_dev *pdev)\n" " \treturn 0;\n" " err_irq:\n" @@ -197,27 +181,24 @@ " \tpci_disable_device(pdev);\n" " \treturn err;\n" " }\n" - "diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath=\n" - "9k/hw.c\n" + "diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c\n" "index bde162f..a17eb13 100644\n" "--- a/drivers/net/wireless/ath9k/hw.c\n" "+++ b/drivers/net/wireless/ath9k/hw.c\n" - "@@ -5017,7 +5017,11 @@ static void ath9k_hw_spur_mitigate(struct ath_ha=\n" - "l *ah,\n" - "=20\n" - " \tfor (i =3D 0; i < 123; i++) {\n" + "@@ -5017,7 +5017,11 @@ static void ath9k_hw_spur_mitigate(struct ath_hal *ah,\n" + " \n" + " \tfor (i = 0; i < 123; i++) {\n" " \t\tif ((cur_vit_mask > lower) && (cur_vit_mask < upper)) {\n" "-\t\t\tif ((abs(cur_vit_mask - bin)) < 75)\n" "+\n" "+\t\t\t/* workaround for gcc bug #37014 */\n" - "+\t\t\tvolatile int tmp =3D abs(cur_vit_mask - bin);\n" + "+\t\t\tvolatile int tmp = abs(cur_vit_mask - bin);\n" "+\n" "+\t\t\tif (tmp < 75)\n" - " \t\t\t\tmask_amt =3D 1;\n" + " \t\t\t\tmask_amt = 1;\n" " \t\t\telse\n" - " \t\t\t\tmask_amt =3D 0;\n" - "diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43=\n" - "/main.c\n" + " \t\t\t\tmask_amt = 0;\n" + "diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c\n" "index 3bf3a86..7205a93 100644\n" "--- a/drivers/net/wireless/b43/main.c\n" "+++ b/drivers/net/wireless/b43/main.c\n" @@ -230,17 +211,16 @@ " #include <linux/wireless.h>\n" " #include <linux/workqueue.h>\n" "@@ -4615,7 +4614,9 @@ static void b43_sprom_fixup(struct ssb_bus *bus)\n" - " \tif (bus->bustype =3D=3D SSB_BUSTYPE_PCI) {\n" - " \t\tpdev =3D bus->host_pci;\n" + " \tif (bus->bustype == SSB_BUSTYPE_PCI) {\n" + " \t\tpdev = bus->host_pci;\n" " \t\tif (IS_PDEV(pdev, BROADCOM, 0x4318, ASUSTEK, 0x100F) ||\n" "+\t\t IS_PDEV(pdev, BROADCOM, 0x4320, DELL, 0x0003) ||\n" " \t\t IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0015) ||\n" "+\t\t IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0014) ||\n" " \t\t IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0013))\n" - " \t\t\tbus->sprom.boardflags_lo &=3D ~B43_BFL_BTCOEXIST;\n" + " \t\t\tbus->sprom.boardflags_lo &= ~B43_BFL_BTCOEXIST;\n" " \t}\n" - "diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2=\n" - "100.c\n" + "diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c\n" "index c6f886e..19a401c 100644\n" "--- a/drivers/net/wireless/ipw2100.c\n" "+++ b/drivers/net/wireless/ipw2100.c\n" @@ -252,170 +232,155 @@ " #include <linux/time.h>\n" " #include <linux/firmware.h>\n" " #include <linux/acpi.h>\n" - "diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2=\n" - "200.c\n" + "diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c\n" "index 36e8d2f..dcce354 100644\n" "--- a/drivers/net/wireless/ipw2200.c\n" "+++ b/drivers/net/wireless/ipw2200.c\n" "@@ -31,7 +31,6 @@\n" - " **********************************************************************=\n" - "********/\n" - "=20\n" + " ******************************************************************************/\n" + " \n" " #include \"ipw2200.h\"\n" "-#include <linux/version.h>\n" - "=20\n" - "=20\n" + " \n" + " \n" " #ifndef KBUILD_EXTMOD\n" - "diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wire=\n" - "less/iwlwifi/iwl-3945.c\n" + "diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c\n" "index b3931f6..3f51f36 100644\n" "--- a/drivers/net/wireless/iwlwifi/iwl-3945.c\n" "+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c\n" "@@ -26,7 +26,6 @@\n" - "=20\n" + " \n" " #include <linux/kernel.h>\n" " #include <linux/module.h>\n" "-#include <linux/version.h>\n" " #include <linux/init.h>\n" " #include <linux/pci.h>\n" " #include <linux/dma-mapping.h>\n" - "diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wire=\n" - "less/iwlwifi/iwl-4965.c\n" + "diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c\n" "index 22bb269..e258122 100644\n" "--- a/drivers/net/wireless/iwlwifi/iwl-4965.c\n" "+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c\n" "@@ -26,7 +26,6 @@\n" - "=20\n" + " \n" " #include <linux/kernel.h>\n" " #include <linux/module.h>\n" "-#include <linux/version.h>\n" " #include <linux/init.h>\n" " #include <linux/pci.h>\n" " #include <linux/dma-mapping.h>\n" - "@@ -967,7 +966,7 @@ static int iwl4965_interpolate_chan(struct iwl_priv=\n" - " *priv, u32 channel,\n" - "=20\n" - " \ts =3D iwl4965_get_sub_band(priv, channel);\n" - " \tif (s >=3D EEPROM_TX_POWER_BANDS) {\n" + "@@ -967,7 +966,7 @@ static int iwl4965_interpolate_chan(struct iwl_priv *priv, u32 channel,\n" + " \n" + " \ts = iwl4965_get_sub_band(priv, channel);\n" + " \tif (s >= EEPROM_TX_POWER_BANDS) {\n" "-\t\tIWL_ERROR(\"Tx Power can not find channel %d \", channel);\n" "+\t\tIWL_ERROR(\"Tx Power can not find channel %d\\n\", channel);\n" " \t\treturn -1;\n" " \t}\n" - "=20\n" - "diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wire=\n" - "less/iwlwifi/iwl-5000.c\n" + " \n" + "diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c\n" "index f3d139b..cbc01a0 100644\n" "--- a/drivers/net/wireless/iwlwifi/iwl-5000.c\n" "+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c\n" "@@ -25,7 +25,6 @@\n" - "=20\n" + " \n" " #include <linux/kernel.h>\n" " #include <linux/module.h>\n" "-#include <linux/version.h>\n" " #include <linux/init.h>\n" " #include <linux/pci.h>\n" " #include <linux/dma-mapping.h>\n" - "diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wirel=\n" - "ess/iwlwifi/iwl-agn.c\n" + "diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c\n" "index ed09e48..061ffba 100644\n" "--- a/drivers/net/wireless/iwlwifi/iwl-agn.c\n" "+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c\n" "@@ -29,7 +29,6 @@\n" - "=20\n" + " \n" " #include <linux/kernel.h>\n" " #include <linux/module.h>\n" "-#include <linux/version.h>\n" " #include <linux/init.h>\n" " #include <linux/pci.h>\n" " #include <linux/dma-mapping.h>\n" - "diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wire=\n" - "less/iwlwifi/iwl-core.c\n" + "diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c\n" "index 9bd6180..c72f725 100644\n" "--- a/drivers/net/wireless/iwlwifi/iwl-core.c\n" "+++ b/drivers/net/wireless/iwlwifi/iwl-core.c\n" "@@ -28,7 +28,6 @@\n" - "=20\n" + " \n" " #include <linux/kernel.h>\n" " #include <linux/module.h>\n" "-#include <linux/version.h>\n" " #include <net/mac80211.h>\n" - "=20\n" + " \n" " struct iwl_priv; /* FIXME: remove */\n" - "diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wi=\n" - "reless/iwlwifi/iwl-eeprom.c\n" + "diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c\n" "index bce5383..3715575 100644\n" "--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c\n" "+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c\n" "@@ -63,7 +63,6 @@\n" - "=20\n" + " \n" " #include <linux/kernel.h>\n" " #include <linux/module.h>\n" "-#include <linux/version.h>\n" " #include <linux/init.h>\n" - "=20\n" + " \n" " #include <net/mac80211.h>\n" - "@@ -146,7 +145,7 @@ int iwlcore_eeprom_verify_signature(struct iwl_priv=\n" - " *priv)\n" + "@@ -146,7 +145,7 @@ int iwlcore_eeprom_verify_signature(struct iwl_priv *priv)\n" " {\n" - " \tu32 gp =3D iwl_read32(priv, CSR_EEPROM_GP);\n" - " \tif ((gp & CSR_EEPROM_GP_VALID_MSK) =3D=3D CSR_EEPROM_GP_BAD_SIGNATURE=\n" - ") {\n" - "-\t\tIWL_ERROR(\"EEPROM not found, EEPROM_GP=3D0x%08x\", gp);\n" - "+\t\tIWL_ERROR(\"EEPROM not found, EEPROM_GP=3D0x%08x\\n\", gp);\n" + " \tu32 gp = iwl_read32(priv, CSR_EEPROM_GP);\n" + " \tif ((gp & CSR_EEPROM_GP_VALID_MSK) == CSR_EEPROM_GP_BAD_SIGNATURE) {\n" + "-\t\tIWL_ERROR(\"EEPROM not found, EEPROM_GP=0x%08x\", gp);\n" + "+\t\tIWL_ERROR(\"EEPROM not found, EEPROM_GP=0x%08x\\n\", gp);\n" " \t\treturn -ENOENT;\n" " \t}\n" " \treturn 0;\n" "@@ -227,7 +226,7 @@ int iwl_eeprom_init(struct iwl_priv *priv)\n" - "=20\n" - " \tret =3D priv->cfg->ops->lib->eeprom_ops.verify_signature(priv);\n" + " \n" + " \tret = priv->cfg->ops->lib->eeprom_ops.verify_signature(priv);\n" " \tif (ret < 0) {\n" - "-\t\tIWL_ERROR(\"EEPROM not found, EEPROM_GP=3D0x%08x\", gp);\n" - "+\t\tIWL_ERROR(\"EEPROM not found, EEPROM_GP=3D0x%08x\\n\", gp);\n" - " \t\tret =3D -ENOENT;\n" + "-\t\tIWL_ERROR(\"EEPROM not found, EEPROM_GP=0x%08x\", gp);\n" + "+\t\tIWL_ERROR(\"EEPROM not found, EEPROM_GP=0x%08x\\n\", gp);\n" + " \t\tret = -ENOENT;\n" " \t\tgoto err;\n" " \t}\n" "@@ -254,7 +253,7 @@ int iwl_eeprom_init(struct iwl_priv *priv)\n" " \t\t}\n" - "=20\n" + " \n" " \t\tif (!(r & CSR_EEPROM_REG_READ_VALID_MSK)) {\n" "-\t\t\tIWL_ERROR(\"Time out reading EEPROM[%d]\", addr);\n" "+\t\t\tIWL_ERROR(\"Time out reading EEPROM[%d]\\n\", addr);\n" - " \t\t\tret =3D -ETIMEDOUT;\n" + " \t\t\tret = -ETIMEDOUT;\n" " \t\t\tgoto done;\n" " \t\t}\n" - "diff --git a/drivers/net/wireless/iwlwifi/iwl-hcmd.c b/drivers/net/wire=\n" - "less/iwlwifi/iwl-hcmd.c\n" + "diff --git a/drivers/net/wireless/iwlwifi/iwl-hcmd.c b/drivers/net/wireless/iwlwifi/iwl-hcmd.c\n" "index 6512834..2eb03ee 100644\n" "--- a/drivers/net/wireless/iwlwifi/iwl-hcmd.c\n" "+++ b/drivers/net/wireless/iwlwifi/iwl-hcmd.c\n" "@@ -28,7 +28,6 @@\n" - "=20\n" + " \n" " #include <linux/kernel.h>\n" " #include <linux/module.h>\n" "-#include <linux/version.h>\n" " #include <net/mac80211.h>\n" - "=20\n" + " \n" " #include \"iwl-dev.h\" /* FIXME: remove */\n" - "diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wir=\n" - "eless/iwlwifi/iwl-power.c\n" + "diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c\n" "index 028e305..a099c9e 100644\n" "--- a/drivers/net/wireless/iwlwifi/iwl-power.c\n" "+++ b/drivers/net/wireless/iwlwifi/iwl-power.c\n" "@@ -29,7 +29,6 @@\n" - "=20\n" + " \n" " #include <linux/kernel.h>\n" " #include <linux/module.h>\n" "-#include <linux/version.h>\n" " #include <linux/init.h>\n" - "=20\n" + " \n" " #include <net/mac80211.h>\n" - "diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wirel=\n" - "ess/iwlwifi/iwl-sta.c\n" + "diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c\n" "index 60a6e01..6283a3a 100644\n" "--- a/drivers/net/wireless/iwlwifi/iwl-sta.c\n" "+++ b/drivers/net/wireless/iwlwifi/iwl-sta.c\n" - "@@ -207,7 +207,7 @@ static void iwl_set_ht_add_station(struct iwl_priv =\n" - "*priv, u8 index,\n" + "@@ -207,7 +207,7 @@ static void iwl_set_ht_add_station(struct iwl_priv *priv, u8 index,\n" " \tcase WLAN_HT_CAP_MIMO_PS_DISABLED:\n" " \t\tbreak;\n" " \tdefault:\n" @@ -423,165 +388,152 @@ "+\t\tIWL_WARNING(\"Invalid MIMO PS mode %d\\n\", mimo_ps_mode);\n" " \t\tbreak;\n" " \t}\n" - "=20\n" - "@@ -969,7 +969,7 @@ int iwl_get_sta_id(struct iwl_priv *priv, struct ie=\n" - "ee80211_hdr *hdr)\n" + " \n" + "@@ -969,7 +969,7 @@ int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)\n" " \t\treturn priv->hw_params.bcast_sta_id;\n" - "=20\n" + " \n" " \tdefault:\n" "-\t\tIWL_WARNING(\"Unknown mode of operation: %d\", priv->iw_mode);\n" "+\t\tIWL_WARNING(\"Unknown mode of operation: %d\\n\", priv->iw_mode);\n" " \t\treturn priv->hw_params.bcast_sta_id;\n" " \t}\n" " }\n" - "diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wirele=\n" - "ss/iwlwifi/iwl-tx.c\n" + "diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c\n" "index 4108c7c..d82823b 100644\n" "--- a/drivers/net/wireless/iwlwifi/iwl-tx.c\n" "+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c\n" "@@ -493,7 +493,7 @@ int iwl_txq_ctx_reset(struct iwl_priv *priv)\n" " \t/* Alloc keep-warm buffer */\n" - " \tret =3D iwl_kw_alloc(priv);\n" + " \tret = iwl_kw_alloc(priv);\n" " \tif (ret) {\n" "-\t\tIWL_ERROR(\"Keep Warm allocation failed\");\n" "+\t\tIWL_ERROR(\"Keep Warm allocation failed\\n\");\n" " \t\tgoto error_kw;\n" " \t}\n" " \tspin_lock_irqsave(&priv->lock, flags);\n" - "@@ -1463,7 +1463,7 @@ void iwl_rx_reply_compressed_ba(struct iwl_priv *=\n" - "priv,\n" - " \tu16 ba_resp_scd_ssn =3D le16_to_cpu(ba_resp->scd_ssn);\n" - "=20\n" - " \tif (scd_flow >=3D priv->hw_params.max_txq_num) {\n" + "@@ -1463,7 +1463,7 @@ void iwl_rx_reply_compressed_ba(struct iwl_priv *priv,\n" + " \tu16 ba_resp_scd_ssn = le16_to_cpu(ba_resp->scd_ssn);\n" + " \n" + " \tif (scd_flow >= priv->hw_params.max_txq_num) {\n" "-\t\tIWL_ERROR(\"BUG_ON scd_flow is bigger than number of queues\");\n" "+\t\tIWL_ERROR(\"BUG_ON scd_flow is bigger than number of queues\\n\");\n" " \t\treturn;\n" " \t}\n" - "=20\n" - "diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/=\n" - "wireless/iwlwifi/iwl3945-base.c\n" + " \n" + "diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c\n" "index 444847a..b775d5b 100644\n" "--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c\n" "+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c\n" "@@ -29,7 +29,6 @@\n" - "=20\n" + " \n" " #include <linux/kernel.h>\n" " #include <linux/module.h>\n" "-#include <linux/version.h>\n" " #include <linux/init.h>\n" " #include <linux/pci.h>\n" " #include <linux/dma-mapping.h>\n" - "@@ -1558,7 +1557,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv=\n" - ")\n" - " \tBUILD_BUG_ON(sizeof(priv->eeprom) !=3D IWL_EEPROM_IMAGE_SIZE);\n" - "=20\n" - " \tif ((gp & CSR_EEPROM_GP_VALID_MSK) =3D=3D CSR_EEPROM_GP_BAD_SIGNATURE=\n" - ") {\n" - "-\t\tIWL_ERROR(\"EEPROM not found, EEPROM_GP=3D0x%08x\", gp);\n" - "+\t\tIWL_ERROR(\"EEPROM not found, EEPROM_GP=3D0x%08x\\n\", gp);\n" + "@@ -1558,7 +1557,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv)\n" + " \tBUILD_BUG_ON(sizeof(priv->eeprom) != IWL_EEPROM_IMAGE_SIZE);\n" + " \n" + " \tif ((gp & CSR_EEPROM_GP_VALID_MSK) == CSR_EEPROM_GP_BAD_SIGNATURE) {\n" + "-\t\tIWL_ERROR(\"EEPROM not found, EEPROM_GP=0x%08x\", gp);\n" + "+\t\tIWL_ERROR(\"EEPROM not found, EEPROM_GP=0x%08x\\n\", gp);\n" " \t\treturn -ENOENT;\n" " \t}\n" - "=20\n" - "@@ -1583,7 +1582,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv=\n" - ")\n" + " \n" + "@@ -1583,7 +1582,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv)\n" " \t\t}\n" - "=20\n" + " \n" " \t\tif (!(r & CSR_EEPROM_REG_READ_VALID_MSK)) {\n" "-\t\t\tIWL_ERROR(\"Time out reading EEPROM[%d]\", addr);\n" "+\t\t\tIWL_ERROR(\"Time out reading EEPROM[%d]\\n\", addr);\n" " \t\t\treturn -ETIMEDOUT;\n" " \t\t}\n" - " \t\te[addr / 2] =3D le16_to_cpu((__force __le16)(r >> 16));\n" - "@@ -2507,7 +2506,7 @@ static int iwl3945_get_sta_id(struct iwl3945_priv=\n" - " *priv, struct ieee80211_hdr *h\n" + " \t\te[addr / 2] = le16_to_cpu((__force __le16)(r >> 16));\n" + "@@ -2507,7 +2506,7 @@ static int iwl3945_get_sta_id(struct iwl3945_priv *priv, struct ieee80211_hdr *h\n" " \t\treturn priv->hw_setting.bcast_sta_id;\n" - "=20\n" + " \n" " \tdefault:\n" "-\t\tIWL_WARNING(\"Unknown mode of operation: %d\", priv->iw_mode);\n" "+\t\tIWL_WARNING(\"Unknown mode of operation: %d\\n\", priv->iw_mode);\n" " \t\treturn priv->hw_setting.bcast_sta_id;\n" " \t}\n" " }\n" - "diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireles=\n" - "s/p54/p54common.c\n" + "diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c\n" "index 83cd85e..29be3dc 100644\n" "--- a/drivers/net/wireless/p54/p54common.c\n" "+++ b/drivers/net/wireless/p54/p54common.c\n" - "@@ -413,12 +413,12 @@ static void p54_rx_frame_sent(struct ieee80211_hw=\n" - " *dev, struct sk_buff *skb)\n" - " \t\t\tlast_addr =3D range->end_addr;\n" + "@@ -413,12 +413,12 @@ static void p54_rx_frame_sent(struct ieee80211_hw *dev, struct sk_buff *skb)\n" + " \t\t\tlast_addr = range->end_addr;\n" " \t\t\t__skb_unlink(entry, &priv->tx_queue);\n" " \t\t\tmemset(&info->status, 0, sizeof(info->status));\n" "-\t\t\tpriv->tx_stats[skb_get_queue_mapping(skb)].len--;\n" - " \t\t\tentry_hdr =3D (struct p54_control_hdr *) entry->data;\n" - " \t\t\tentry_data =3D (struct p54_tx_control_allocdata *) entry_hdr->data;\n" - " \t\t\tif ((entry_hdr->magic1 & cpu_to_le16(0x4000)) !=3D 0)\n" - " \t\t\t\tpad =3D entry_data->align[0];\n" - "=20\n" + " \t\t\tentry_hdr = (struct p54_control_hdr *) entry->data;\n" + " \t\t\tentry_data = (struct p54_tx_control_allocdata *) entry_hdr->data;\n" + " \t\t\tif ((entry_hdr->magic1 & cpu_to_le16(0x4000)) != 0)\n" + " \t\t\t\tpad = entry_data->align[0];\n" + " \n" "+\t\t\tpriv->tx_stats[entry_data->hw_queue - 4].len--;\n" " \t\t\tif (!(info->flags & IEEE80211_TX_CTL_NO_ACK)) {\n" " \t\t\t\tif (!(payload->status & 0x01))\n" - " \t\t\t\t\tinfo->flags |=3D IEEE80211_TX_STAT_ACK;\n" - "@@ -557,6 +557,7 @@ static int p54_tx(struct ieee80211_hw *dev, struct =\n" - "sk_buff *skb)\n" + " \t\t\t\t\tinfo->flags |= IEEE80211_TX_STAT_ACK;\n" + "@@ -557,6 +557,7 @@ static int p54_tx(struct ieee80211_hw *dev, struct sk_buff *skb)\n" " \tstruct p54_tx_control_allocdata *txhdr;\n" " \tsize_t padding, len;\n" " \tu8 rate;\n" - "+\tu8 cts_rate =3D 0x20;\n" - "=20\n" - " \tcurrent_queue =3D &priv->tx_stats[skb_get_queue_mapping(skb)];\n" + "+\tu8 cts_rate = 0x20;\n" + " \n" + " \tcurrent_queue = &priv->tx_stats[skb_get_queue_mapping(skb)];\n" " \tif (unlikely(current_queue->len > current_queue->limit))\n" - "@@ -581,28 +582,28 @@ static int p54_tx(struct ieee80211_hw *dev, struc=\n" - "t sk_buff *skb)\n" - " \thdr->type =3D (info->flags & IEEE80211_TX_CTL_NO_ACK) ? 0 : cpu_to_le=\n" - "16(1);\n" - " \thdr->retry1 =3D hdr->retry2 =3D info->control.retry_limit;\n" - "=20\n" + "@@ -581,28 +582,28 @@ static int p54_tx(struct ieee80211_hw *dev, struct sk_buff *skb)\n" + " \thdr->type = (info->flags & IEEE80211_TX_CTL_NO_ACK) ? 0 : cpu_to_le16(1);\n" + " \thdr->retry1 = hdr->retry2 = info->control.retry_limit;\n" + " \n" "-\tmemset(txhdr->wep_key, 0x0, 16);\n" - "-\ttxhdr->padding =3D 0;\n" - "-\ttxhdr->padding2 =3D 0;\n" + "-\ttxhdr->padding = 0;\n" + "-\ttxhdr->padding2 = 0;\n" "-\n" " \t/* TODO: add support for alternate retry TX rates */\n" - " \trate =3D ieee80211_get_tx_rate(dev, info)->hw_value;\n" + " \trate = ieee80211_get_tx_rate(dev, info)->hw_value;\n" "-\tif (info->flags & IEEE80211_TX_CTL_SHORT_PREAMBLE)\n" "+\tif (info->flags & IEEE80211_TX_CTL_SHORT_PREAMBLE) {\n" - " \t\trate |=3D 0x10;\n" + " \t\trate |= 0x10;\n" "-\tif (info->flags & IEEE80211_TX_CTL_USE_RTS_CTS)\n" - "+\t\tcts_rate |=3D 0x10;\n" + "+\t\tcts_rate |= 0x10;\n" "+\t}\n" "+\tif (info->flags & IEEE80211_TX_CTL_USE_RTS_CTS) {\n" - " \t\trate |=3D 0x40;\n" + " \t\trate |= 0x40;\n" "-\telse if (info->flags & IEEE80211_TX_CTL_USE_CTS_PROTECT)\n" - "+\t\tcts_rate |=3D ieee80211_get_rts_cts_rate(dev, info)->hw_value;\n" + "+\t\tcts_rate |= ieee80211_get_rts_cts_rate(dev, info)->hw_value;\n" "+\t} else if (info->flags & IEEE80211_TX_CTL_USE_CTS_PROTECT) {\n" - " \t\trate |=3D 0x20;\n" - "+\t\tcts_rate |=3D ieee80211_get_rts_cts_rate(dev, info)->hw_value;\n" + " \t\trate |= 0x20;\n" + "+\t\tcts_rate |= ieee80211_get_rts_cts_rate(dev, info)->hw_value;\n" "+\t}\n" " \tmemset(txhdr->rateset, rate, 8);\n" - "-\ttxhdr->wep_key_present =3D 0;\n" - "-\ttxhdr->wep_key_len =3D 0;\n" - "-\ttxhdr->frame_type =3D cpu_to_le32(skb_get_queue_mapping(skb) + 4);\n" - "-\ttxhdr->magic4 =3D 0;\n" - "-\ttxhdr->antenna =3D (info->antenna_sel_tx =3D=3D 0) ?\n" - "+\ttxhdr->key_type =3D 0;\n" - "+\ttxhdr->key_len =3D 0;\n" - "+\ttxhdr->hw_queue =3D skb_get_queue_mapping(skb) + 4;\n" - "+\ttxhdr->tx_antenna =3D (info->antenna_sel_tx =3D=3D 0) ?\n" + "-\ttxhdr->wep_key_present = 0;\n" + "-\ttxhdr->wep_key_len = 0;\n" + "-\ttxhdr->frame_type = cpu_to_le32(skb_get_queue_mapping(skb) + 4);\n" + "-\ttxhdr->magic4 = 0;\n" + "-\ttxhdr->antenna = (info->antenna_sel_tx == 0) ?\n" + "+\ttxhdr->key_type = 0;\n" + "+\ttxhdr->key_len = 0;\n" + "+\ttxhdr->hw_queue = skb_get_queue_mapping(skb) + 4;\n" + "+\ttxhdr->tx_antenna = (info->antenna_sel_tx == 0) ?\n" " \t\t2 : info->antenna_sel_tx - 1;\n" - " \ttxhdr->output_power =3D 0x7f; // HW Maximum\n" - "-\ttxhdr->magic5 =3D (info->flags & IEEE80211_TX_CTL_NO_ACK) ?\n" + " \ttxhdr->output_power = 0x7f; // HW Maximum\n" + "-\ttxhdr->magic5 = (info->flags & IEEE80211_TX_CTL_NO_ACK) ?\n" "-\t\t0 : ((rate > 0x3) ? cpu_to_le32(0x33) : cpu_to_le32(0x23));\n" - "+\ttxhdr->cts_rate =3D (info->flags & IEEE80211_TX_CTL_NO_ACK) ?\n" + "+\ttxhdr->cts_rate = (info->flags & IEEE80211_TX_CTL_NO_ACK) ?\n" "+\t\t\t 0 : cts_rate;\n" " \tif (padding)\n" - " \t\ttxhdr->align[0] =3D padding;\n" - "=20\n" + " \t\ttxhdr->align[0] = padding;\n" + " \n" "@@ -836,10 +837,21 @@ static int p54_start(struct ieee80211_hw *dev)\n" - " \tstruct p54_common *priv =3D dev->priv;\n" + " \tstruct p54_common *priv = dev->priv;\n" " \tint err;\n" - "=20\n" + " \n" "+\tif (!priv->cached_vdcf) {\n" - "+\t\tpriv->cached_vdcf =3D kzalloc(sizeof(struct p54_tx_control_vdcf)+\n" + "+\t\tpriv->cached_vdcf = kzalloc(sizeof(struct p54_tx_control_vdcf)+\n" "+\t\t\tpriv->tx_hdr_len + sizeof(struct p54_control_hdr),\n" "+\t\t\tGFP_KERNEL);\n" "+\n" @@ -589,24 +541,21 @@ "+\t\t\treturn -ENOMEM;\n" "+\t}\n" "+\n" - " \terr =3D priv->open(dev);\n" + " \terr = priv->open(dev);\n" " \tif (!err)\n" - " \t\tpriv->mode =3D IEEE80211_IF_TYPE_MNTR;\n" - "=20\n" + " \t\tpriv->mode = IEEE80211_IF_TYPE_MNTR;\n" + " \n" "+\tp54_init_vdcf(dev);\n" "+\n" " \treturn err;\n" " }\n" - "=20\n" - "@@ -1019,15 +1031,6 @@ struct ieee80211_hw *p54_init_common(size_t priv=\n" - "_data_len)\n" - " \tdev->extra_tx_headroom =3D sizeof(struct p54_control_hdr) + 4 +\n" + " \n" + "@@ -1019,15 +1031,6 @@ struct ieee80211_hw *p54_init_common(size_t priv_data_len)\n" + " \tdev->extra_tx_headroom = sizeof(struct p54_control_hdr) + 4 +\n" " \t\t\t\t sizeof(struct p54_tx_control_allocdata);\n" - "=20\n" - "- priv->cached_vdcf =3D kzalloc(sizeof(struct p54_tx_control_vdc=\n" - "f) +\n" - "- priv->tx_hdr_len + sizeof(struct p54_control_hdr), GFP_K=\n" - "ERNEL);\n" + " \n" + "- priv->cached_vdcf = kzalloc(sizeof(struct p54_tx_control_vdcf) +\n" + "- priv->tx_hdr_len + sizeof(struct p54_control_hdr), GFP_KERNEL);\n" "-\n" "-\tif (!priv->cached_vdcf) {\n" "-\t\tieee80211_free_hw(dev);\n" @@ -615,15 +564,14 @@ "-\n" "-\tp54_init_vdcf(dev);\n" " \tmutex_init(&priv->conf_mutex);\n" - "=20\n" + " \n" " \treturn dev;\n" - "diff --git a/drivers/net/wireless/p54/p54common.h b/drivers/net/wireles=\n" - "s/p54/p54common.h\n" + "diff --git a/drivers/net/wireless/p54/p54common.h b/drivers/net/wireless/p54/p54common.h\n" "index 2245fcc..8db6c0e 100644\n" "--- a/drivers/net/wireless/p54/p54common.h\n" "+++ b/drivers/net/wireless/p54/p54common.h\n" "@@ -183,16 +183,16 @@ struct p54_frame_sent_hdr {\n" - "=20\n" + " \n" " struct p54_tx_control_allocdata {\n" " \tu8 rateset[8];\n" "-\tu16 padding;\n" @@ -647,14 +595,13 @@ "+\tu8 unalloc2[3];\n" " \tu8 align[0];\n" " } __attribute__ ((packed));\n" - "=20\n" - "diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p=\n" - "54/p54usb.c\n" + " \n" + "diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c\n" "index 815c095..cbaca23 100644\n" "--- a/drivers/net/wireless/p54/p54usb.c\n" "+++ b/drivers/net/wireless/p54/p54usb.c\n" "@@ -109,7 +109,17 @@ static void p54u_rx_cb(struct urb *urb)\n" - " \t\turb->context =3D skb;\n" + " \t\turb->context = skb;\n" " \t\tskb_queue_tail(&priv->rx_queue, skb);\n" " \t} else {\n" "+\t\tif (!priv->hw_type)\n" @@ -662,17 +609,16 @@ "+\n" "+\t\tskb_reset_tail_pointer(skb);\n" " \t\tskb_trim(skb, 0);\n" - "+\t\tif (urb->transfer_buffer !=3D skb_tail_pointer(skb)) {\n" + "+\t\tif (urb->transfer_buffer != skb_tail_pointer(skb)) {\n" "+\t\t\t/* this should not happen */\n" "+\t\t\tWARN_ON(1);\n" - "+\t\t\turb->transfer_buffer =3D skb_tail_pointer(skb);\n" + "+\t\t\turb->transfer_buffer = skb_tail_pointer(skb);\n" "+\t\t}\n" "+\n" " \t\tskb_queue_tail(&priv->rx_queue, skb);\n" " \t}\n" - "=20\n" - "diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wi=\n" - "reless/rt2x00/rt2x00queue.h\n" + " \n" + "diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wireless/rt2x00/rt2x00queue.h\n" "index a4a8c57..ff78e52 100644\n" "--- a/drivers/net/wireless/rt2x00/rt2x00queue.h\n" "+++ b/drivers/net/wireless/rt2x00/rt2x00queue.h\n" @@ -680,71 +626,66 @@ " *\tframe transmission failed due to excessive retries.\n" " */\n" " enum txdone_entry_desc_flags {\n" - "-\tTXDONE_UNKNOWN =3D 1 << 0,\n" - "-\tTXDONE_SUCCESS =3D 1 << 1,\n" - "-\tTXDONE_FAILURE =3D 1 << 2,\n" - "-\tTXDONE_EXCESSIVE_RETRY =3D 1 << 3,\n" + "-\tTXDONE_UNKNOWN = 1 << 0,\n" + "-\tTXDONE_SUCCESS = 1 << 1,\n" + "-\tTXDONE_FAILURE = 1 << 2,\n" + "-\tTXDONE_EXCESSIVE_RETRY = 1 << 3,\n" "+\tTXDONE_UNKNOWN,\n" "+\tTXDONE_SUCCESS,\n" "+\tTXDONE_FAILURE,\n" "+\tTXDONE_EXCESSIVE_RETRY,\n" " };\n" - "=20\n" + " \n" " /**\n" - "diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wire=\n" - "less/rt2x00/rt2x00usb.c\n" + "diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c\n" "index 8d76bb2..2050227 100644\n" "--- a/drivers/net/wireless/rt2x00/rt2x00usb.c\n" "+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c\n" - "@@ -181,6 +181,7 @@ static void rt2x00usb_interrupt_txdone(struct urb *=\n" - "urb)\n" + "@@ -181,6 +181,7 @@ static void rt2x00usb_interrupt_txdone(struct urb *urb)\n" " \t * (Only indirectly by looking at the failed TX counters\n" " \t * in the register).\n" " \t */\n" - "+\ttxdesc.flags =3D 0;\n" + "+\ttxdesc.flags = 0;\n" " \tif (!urb->status)\n" " \t\t__set_bit(TXDONE_UNKNOWN, &txdesc.flags);\n" " \telse\n" - "diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/=\n" - "rtl8187_dev.c\n" + "diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c\n" "index 57376fb..ca5deb6 100644\n" "--- a/drivers/net/wireless/rtl8187_dev.c\n" "+++ b/drivers/net/wireless/rtl8187_dev.c\n" - "@@ -40,6 +40,7 @@ static struct usb_device_id rtl8187_table[] __devinit=\n" - "data =3D {\n" + "@@ -40,6 +40,7 @@ static struct usb_device_id rtl8187_table[] __devinitdata = {\n" " \t/* Netgear */\n" - " \t{USB_DEVICE(0x0846, 0x6100), .driver_info =3D DEVICE_RTL8187},\n" - " \t{USB_DEVICE(0x0846, 0x6a00), .driver_info =3D DEVICE_RTL8187},\n" - "+\t{USB_DEVICE(0x0846, 0x4260), .driver_info =3D DEVICE_RTL8187B},\n" + " \t{USB_DEVICE(0x0846, 0x6100), .driver_info = DEVICE_RTL8187},\n" + " \t{USB_DEVICE(0x0846, 0x6a00), .driver_info = DEVICE_RTL8187},\n" + "+\t{USB_DEVICE(0x0846, 0x4260), .driver_info = DEVICE_RTL8187B},\n" " \t/* HP */\n" - " \t{USB_DEVICE(0x03f0, 0xca02), .driver_info =3D DEVICE_RTL8187},\n" + " \t{USB_DEVICE(0x03f0, 0xca02), .driver_info = DEVICE_RTL8187},\n" " \t/* Sitecom */\n" "diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c\n" "index d831a2b..87ab244 100644\n" "--- a/drivers/ssb/main.c\n" "+++ b/drivers/ssb/main.c\n" "@@ -1165,15 +1165,19 @@ EXPORT_SYMBOL(ssb_dma_translation);\n" - "=20\n" + " \n" " int ssb_dma_set_mask(struct ssb_device *dev, u64 mask)\n" " {\n" "+#ifdef CONFIG_SSB_PCIHOST\n" " \tint err;\n" "+#endif\n" - "=20\n" + " \n" " \tswitch (dev->bus->bustype) {\n" " \tcase SSB_BUSTYPE_PCI:\n" "+#ifdef CONFIG_SSB_PCIHOST\n" - " \t\terr =3D pci_set_dma_mask(dev->bus->host_pci, mask);\n" + " \t\terr = pci_set_dma_mask(dev->bus->host_pci, mask);\n" " \t\tif (err)\n" " \t\t\treturn err;\n" - " \t\terr =3D pci_set_consistent_dma_mask(dev->bus->host_pci, mask);\n" + " \t\terr = pci_set_consistent_dma_mask(dev->bus->host_pci, mask);\n" " \t\treturn err;\n" "+#endif\n" " \tcase SSB_BUSTYPE_SSB:\n" " \t\treturn dma_set_mask(dev->dev, mask);\n" " \tdefault:\n" - "@@ -1188,6 +1192,7 @@ void * ssb_dma_alloc_consistent(struct ssb_device=\n" - " *dev, size_t size,\n" + "@@ -1188,6 +1192,7 @@ void * ssb_dma_alloc_consistent(struct ssb_device *dev, size_t size,\n" " {\n" " \tswitch (dev->bus->bustype) {\n" " \tcase SSB_BUSTYPE_PCI:\n" @@ -752,8 +693,7 @@ " \t\tif (gfp_flags & GFP_DMA) {\n" " \t\t\t/* Workaround: The PCI API does not support passing\n" " \t\t\t * a GFP flag. */\n" - "@@ -1195,6 +1200,7 @@ void * ssb_dma_alloc_consistent(struct ssb_device=\n" - " *dev, size_t size,\n" + "@@ -1195,6 +1200,7 @@ void * ssb_dma_alloc_consistent(struct ssb_device *dev, size_t size,\n" " \t\t\t\t\t\t size, dma_handle, gfp_flags);\n" " \t\t}\n" " \t\treturn pci_alloc_consistent(dev->bus->host_pci, size, dma_handle);\n" @@ -761,8 +701,7 @@ " \tcase SSB_BUSTYPE_SSB:\n" " \t\treturn dma_alloc_coherent(dev->dev, size, dma_handle, gfp_flags);\n" " \tdefault:\n" - "@@ -1210,6 +1216,7 @@ void ssb_dma_free_consistent(struct ssb_device *d=\n" - "ev, size_t size,\n" + "@@ -1210,6 +1216,7 @@ void ssb_dma_free_consistent(struct ssb_device *dev, size_t size,\n" " {\n" " \tswitch (dev->bus->bustype) {\n" " \tcase SSB_BUSTYPE_PCI:\n" @@ -770,8 +709,7 @@ " \t\tif (gfp_flags & GFP_DMA) {\n" " \t\t\t/* Workaround: The PCI API does not support passing\n" " \t\t\t * a GFP flag. */\n" - "@@ -1220,6 +1227,7 @@ void ssb_dma_free_consistent(struct ssb_device *d=\n" - "ev, size_t size,\n" + "@@ -1220,6 +1227,7 @@ void ssb_dma_free_consistent(struct ssb_device *dev, size_t size,\n" " \t\tpci_free_consistent(dev->bus->host_pci, size,\n" " \t\t\t\t vaddr, dma_handle);\n" " \t\treturn;\n" @@ -794,14 +732,12 @@ "+ *\tthe driver can fetch them with ieee80211_get_buffered_bc().\n" " *\n" " * @IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE:\n" - " *\tHardware is not capable of short slot operation on the 2.4 GHz band=\n" - "=2E\n" + " *\tHardware is not capable of short slot operation on the 2.4 GHz band.\n" "@@ -1099,10 +1096,8 @@ enum ieee80211_ampdu_mlme_action {\n" " *\tSee the section \"Frame filtering\" for more information.\n" " *\tThis callback must be implemented and atomic.\n" " *\n" - "- * @set_tim: Set TIM bit. If the hardware/firmware takes care of beaco=\n" - "n\n" + "- * @set_tim: Set TIM bit. If the hardware/firmware takes care of beacon\n" "- *\tgeneration (that is, %IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE is set)\n" "- *\tmac80211 calls this function when a TIM bit must be set or cleared\n" "- *\tfor a given AID. Must be atomic.\n" @@ -814,22 +750,20 @@ "index e1d11c9..1e97fb9 100644\n" "--- a/net/mac80211/mlme.c\n" "+++ b/net/mac80211/mlme.c\n" - "@@ -2103,6 +2103,8 @@ static void ieee80211_rx_mgmt_assoc_resp(struct i=\n" - "eee80211_sub_if_data *sdata,\n" + "@@ -2103,6 +2103,8 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,\n" " \t\t\trcu_read_unlock();\n" " \t\t\treturn;\n" " \t\t}\n" "+\t\t/* update new sta with its last rx activity */\n" - "+\t\tsta->last_rx =3D jiffies;\n" + "+\t\tsta->last_rx = jiffies;\n" " \t}\n" - "=20\n" + " \n" " \t/*\n" "diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c\n" "index d2d4565..35a9994 100644\n" "--- a/net/rfkill/rfkill.c\n" "+++ b/net/rfkill/rfkill.c\n" - "@@ -150,6 +150,8 @@ static void update_rfkill_state(struct rfkill *rfki=\n" - "ll)\n" + "@@ -150,6 +150,8 @@ static void update_rfkill_state(struct rfkill *rfkill)\n" " * calls and handling all the red tape such as issuing notifications\n" " * if the call is successful.\n" " *\n" @@ -838,19 +772,17 @@ " * Note that the @force parameter cannot override a (possibly cached)\n" " * state of RFKILL_STATE_HARD_BLOCKED. Any device making use of\n" " * RFKILL_STATE_HARD_BLOCKED implements either get_state() or\n" - "@@ -168,6 +170,9 @@ static int rfkill_toggle_radio(struct rfkill *rfkil=\n" - "l,\n" - " \tint retval =3D 0;\n" + "@@ -168,6 +170,9 @@ static int rfkill_toggle_radio(struct rfkill *rfkill,\n" + " \tint retval = 0;\n" " \tenum rfkill_state oldstate, newstate;\n" - "=20\n" + " \n" "+\tif (unlikely(rfkill->dev.power.power_state.event & PM_EVENT_SLEEP))\n" "+\t\treturn -EBUSY;\n" "+\n" - " \toldstate =3D rfkill->state;\n" - "=20\n" + " \toldstate = rfkill->state;\n" + " \n" " \tif (rfkill->get_state && !force &&\n" - "@@ -214,7 +219,7 @@ static int rfkill_toggle_radio(struct rfkill *rfkil=\n" - "l,\n" + "@@ -214,7 +219,7 @@ static int rfkill_toggle_radio(struct rfkill *rfkill,\n" " *\n" " * This function toggles the state of all switches of given type,\n" " * unless a specific switch is claimed by userspace (in which case,\n" @@ -863,38 +795,31 @@ " /**\n" " * rfkill_epo - emergency power off all transmitters\n" " *\n" - "- * This kicks all rfkill devices to RFKILL_STATE_SOFT_BLOCKED, ignorin=\n" - "g\n" + "- * This kicks all rfkill devices to RFKILL_STATE_SOFT_BLOCKED, ignoring\n" "- * everything in its path but rfkill_mutex and rfkill->mutex.\n" - "+ * This kicks all non-suspended rfkill devices to RFKILL_STATE_SOFT_BL=\n" - "OCKED,\n" + "+ * This kicks all non-suspended rfkill devices to RFKILL_STATE_SOFT_BLOCKED,\n" "+ * ignoring everything in its path but rfkill_mutex and rfkill->mutex.\n" " */\n" " void rfkill_epo(void)\n" " {\n" "@@ -458,13 +463,14 @@ static int rfkill_resume(struct device *dev)\n" - " \tif (dev->power.power_state.event !=3D PM_EVENT_ON) {\n" + " \tif (dev->power.power_state.event != PM_EVENT_ON) {\n" " \t\tmutex_lock(&rfkill->mutex);\n" - "=20\n" - "+\t\tdev->power.power_state.event =3D PM_EVENT_ON;\n" + " \n" + "+\t\tdev->power.power_state.event = PM_EVENT_ON;\n" "+\n" " \t\t/* restore radio state AND notify everybody */\n" " \t\trfkill_toggle_radio(rfkill, rfkill->state, 1);\n" - "=20\n" + " \n" " \t\tmutex_unlock(&rfkill->mutex);\n" " \t}\n" - "=20\n" - "-\tdev->power.power_state =3D PMSG_ON;\n" + " \n" + "-\tdev->power.power_state = PMSG_ON;\n" " \treturn 0;\n" " }\n" " #else\n" - "--=20\n" + "-- \n" "John W. Linville\n" - "linville@tuxdriver.com\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-wireles=\n" - "s\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + linville@tuxdriver.com -9624ddb4d080b16739e0c6cbb0f714cfb40308174e494ffc2bb0f9db229f70ec +d55e13bf0abd61f7bda722c09eb5cba596d715e639d9c30d69c2d30f7fe2e1c1
diff --git a/a/1.txt b/N2/1.txt index 7d97ac0..5636297 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,28 +1,25 @@ On Sun, Aug 17, 2008 at 03:12:51PM -0700, David Miller wrote: > Two commits in here need a fixup. ->=20 +> > Their commit messages reference SHA IDs but do not give a commit > header line text reference as well. ->=20 +> > p54: Fix regression due to commit b19fa1f > ath5k: Don't fiddle with MSI on suspend/resume. ->=20 +> > Please fix this up and give me another pull request, thanks! Dave, -(Revision 2, commit references in changelogs augmented w/ subject text.= -) +(Revision 2, commit references in changelogs augmented w/ subject text.) -Here is the latest round of wireless fixes for 2.6.27. The silliest on= -e +Here is the latest round of wireless fixes for 2.6.27. The silliest one is the one from Adrian Bunk, which applies the gcc-related fix to ath9k again because there were two identical pieces of code to fix -- I guess I didn't get the joke *facepalm*... -I don't think there is anything else remarkable, although I think we fi= -x +I don't think there is anything else remarkable, although I think we fix a couple of the current regressions on LKML. Thanks, @@ -37,22 +34,19 @@ Individual patches are available here: --- -The following changes since commit 23197916c447a1623d196e6547781180905f= -0bb2: +The following changes since commit 23197916c447a1623d196e6547781180905f0bb2: Matt Carlson (1): tg3: Update version to 3.94 are available in the git repository at: - git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.g= -it master + git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git master Adrian Bunk (1): ath9k: work around gcc ICEs (again) Christian Lamparter (3): - p54: Fix regression due to "net: Delete NETDEVICES_MULTIQUEUE kco= -nfig option" + p54: Fix regression due to "net: Delete NETDEVICES_MULTIQUEUE kconfig option" p54: move p54_vdcf_init to the right place. p54u: reset skb's data/tail pointer on requeue @@ -73,12 +67,10 @@ Jochen Friedrich (1): Larry Finger (2): b43: Fix for SPROM coding error in Linksys WMP54G (BCM4306/3) - b43: Fix for another Bluetooth Coexistence SPROM Programming erro= -r for BCM4306 + b43: Fix for another Bluetooth Coexistence SPROM Programming error for BCM4306 Luis R. Rodriguez (1): - mac80211: remove kdoc references to IEEE80211_HW_HOST_GEN_BEACON_= -TEMPLATE + mac80211: remove kdoc references to IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE Michael Karcher (1): ath5k: Don't fiddle with MSI on suspend/resume. @@ -86,7 +78,7 @@ Michael Karcher (1): Ron Rindjunsky (1): mac80211: update new sta's rx timestamp -matthieu Barth=E9lemy (1): +matthieu Barthélemy (1): rtl8187: Add USB ID for Netgear WG111V3 Documentation/rfkill.txt | 5 +++ @@ -106,8 +98,7 @@ matthieu Barth=E9lemy (1): drivers/net/wireless/iwlwifi/iwl-sta.c | 4 +- drivers/net/wireless/iwlwifi/iwl-tx.c | 4 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 7 ++-- - drivers/net/wireless/p54/p54common.c | 51 ++++++++++++++-----= -------- + drivers/net/wireless/p54/p54common.c | 51 ++++++++++++++------------ drivers/net/wireless/p54/p54common.h | 18 +++++----- drivers/net/wireless/p54/p54usb.c | 10 +++++ drivers/net/wireless/rt2x00/rt2x00queue.h | 8 ++-- @@ -123,40 +114,33 @@ diff --git a/Documentation/rfkill.txt b/Documentation/rfkill.txt index 28b6ec8..6fcb306 100644 --- a/Documentation/rfkill.txt +++ b/Documentation/rfkill.txt -@@ -363,6 +363,11 @@ This rule exists because users of the rfkill subsy= -stem expect to get (and set, - when possible) the overall transmitter rfkill state, not of a particul= -ar rfkill +@@ -363,6 +363,11 @@ This rule exists because users of the rfkill subsystem expect to get (and set, + when possible) the overall transmitter rfkill state, not of a particular rfkill line. -=20 -+5. During suspend, the rfkill class will attempt to soft-block the rad= -io -+through a call to rfkill->toggle_radio, and will try to restore its pr= -evious -+state during resume. After a rfkill class is suspended, it will *not*= - call + ++5. During suspend, the rfkill class will attempt to soft-block the radio ++through a call to rfkill->toggle_radio, and will try to restore its previous ++state during resume. After a rfkill class is suspended, it will *not* call +rfkill->toggle_radio until it is resumed. + Example of a WLAN wireless driver connected to the rfkill subsystem: -------------------------------------------------------------------- -=20 -diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/a= -th5k/base.c + +diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c index 2028866..b20a45a 100644 --- a/drivers/net/wireless/ath5k/base.c +++ b/drivers/net/wireless/ath5k/base.c @@ -40,7 +40,6 @@ * */ -=20 + -#include <linux/version.h> #include <linux/module.h> #include <linux/delay.h> #include <linux/hardirq.h> -@@ -587,7 +586,6 @@ ath5k_pci_suspend(struct pci_dev *pdev, pm_message_= -t state) +@@ -587,7 +586,6 @@ ath5k_pci_suspend(struct pci_dev *pdev, pm_message_t state) ath5k_stop_hw(sc); -=20 + free_irq(pdev->irq, sc); - pci_disable_msi(pdev); pci_save_state(pdev); @@ -165,17 +149,17 @@ t state) @@ -616,12 +614,10 @@ ath5k_pci_resume(struct pci_dev *pdev) */ pci_write_config_byte(pdev, 0x41, 0); -=20 + - pci_enable_msi(pdev); - - err =3D request_irq(pdev->irq, ath5k_intr, IRQF_SHARED, "ath", sc); + err = request_irq(pdev->irq, ath5k_intr, IRQF_SHARED, "ath", sc); if (err) { ATH5K_ERR(sc, "request_irq failed\n"); - goto err_msi; + goto err_no_irq; } -=20 - err =3D ath5k_init(sc); + + err = ath5k_init(sc); @@ -642,8 +638,7 @@ ath5k_pci_resume(struct pci_dev *pdev) return 0; err_irq: @@ -186,27 +170,24 @@ t state) pci_disable_device(pdev); return err; } -diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath= -9k/hw.c +diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c index bde162f..a17eb13 100644 --- a/drivers/net/wireless/ath9k/hw.c +++ b/drivers/net/wireless/ath9k/hw.c -@@ -5017,7 +5017,11 @@ static void ath9k_hw_spur_mitigate(struct ath_ha= -l *ah, -=20 - for (i =3D 0; i < 123; i++) { +@@ -5017,7 +5017,11 @@ static void ath9k_hw_spur_mitigate(struct ath_hal *ah, + + for (i = 0; i < 123; i++) { if ((cur_vit_mask > lower) && (cur_vit_mask < upper)) { - if ((abs(cur_vit_mask - bin)) < 75) + + /* workaround for gcc bug #37014 */ -+ volatile int tmp =3D abs(cur_vit_mask - bin); ++ volatile int tmp = abs(cur_vit_mask - bin); + + if (tmp < 75) - mask_amt =3D 1; + mask_amt = 1; else - mask_amt =3D 0; -diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43= -/main.c + mask_amt = 0; +diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 3bf3a86..7205a93 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -219,17 +200,16 @@ index 3bf3a86..7205a93 100644 #include <linux/wireless.h> #include <linux/workqueue.h> @@ -4615,7 +4614,9 @@ static void b43_sprom_fixup(struct ssb_bus *bus) - if (bus->bustype =3D=3D SSB_BUSTYPE_PCI) { - pdev =3D bus->host_pci; + if (bus->bustype == SSB_BUSTYPE_PCI) { + pdev = bus->host_pci; if (IS_PDEV(pdev, BROADCOM, 0x4318, ASUSTEK, 0x100F) || + IS_PDEV(pdev, BROADCOM, 0x4320, DELL, 0x0003) || IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0015) || + IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0014) || IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0013)) - bus->sprom.boardflags_lo &=3D ~B43_BFL_BTCOEXIST; + bus->sprom.boardflags_lo &= ~B43_BFL_BTCOEXIST; } -diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2= -100.c +diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c index c6f886e..19a401c 100644 --- a/drivers/net/wireless/ipw2100.c +++ b/drivers/net/wireless/ipw2100.c @@ -241,170 +221,155 @@ index c6f886e..19a401c 100644 #include <linux/time.h> #include <linux/firmware.h> #include <linux/acpi.h> -diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2= -200.c +diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index 36e8d2f..dcce354 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c @@ -31,7 +31,6 @@ - **********************************************************************= -********/ -=20 + ******************************************************************************/ + #include "ipw2200.h" -#include <linux/version.h> -=20 -=20 + + #ifndef KBUILD_EXTMOD -diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wire= -less/iwlwifi/iwl-3945.c +diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index b3931f6..3f51f36 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c @@ -26,7 +26,6 @@ -=20 + #include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> #include <linux/pci.h> #include <linux/dma-mapping.h> -diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wire= -less/iwlwifi/iwl-4965.c +diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 22bb269..e258122 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c @@ -26,7 +26,6 @@ -=20 + #include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> #include <linux/pci.h> #include <linux/dma-mapping.h> -@@ -967,7 +966,7 @@ static int iwl4965_interpolate_chan(struct iwl_priv= - *priv, u32 channel, -=20 - s =3D iwl4965_get_sub_band(priv, channel); - if (s >=3D EEPROM_TX_POWER_BANDS) { +@@ -967,7 +966,7 @@ static int iwl4965_interpolate_chan(struct iwl_priv *priv, u32 channel, + + s = iwl4965_get_sub_band(priv, channel); + if (s >= EEPROM_TX_POWER_BANDS) { - IWL_ERROR("Tx Power can not find channel %d ", channel); + IWL_ERROR("Tx Power can not find channel %d\n", channel); return -1; } -=20 -diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wire= -less/iwlwifi/iwl-5000.c + +diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index f3d139b..cbc01a0 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c @@ -25,7 +25,6 @@ -=20 + #include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> #include <linux/pci.h> #include <linux/dma-mapping.h> -diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wirel= -ess/iwlwifi/iwl-agn.c +diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index ed09e48..061ffba 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -29,7 +29,6 @@ -=20 + #include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> #include <linux/pci.h> #include <linux/dma-mapping.h> -diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wire= -less/iwlwifi/iwl-core.c +diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 9bd6180..c72f725 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c @@ -28,7 +28,6 @@ -=20 + #include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <net/mac80211.h> -=20 + struct iwl_priv; /* FIXME: remove */ -diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wi= -reless/iwlwifi/iwl-eeprom.c +diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c index bce5383..3715575 100644 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c @@ -63,7 +63,6 @@ -=20 + #include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> -=20 + #include <net/mac80211.h> -@@ -146,7 +145,7 @@ int iwlcore_eeprom_verify_signature(struct iwl_priv= - *priv) +@@ -146,7 +145,7 @@ int iwlcore_eeprom_verify_signature(struct iwl_priv *priv) { - u32 gp =3D iwl_read32(priv, CSR_EEPROM_GP); - if ((gp & CSR_EEPROM_GP_VALID_MSK) =3D=3D CSR_EEPROM_GP_BAD_SIGNATURE= -) { -- IWL_ERROR("EEPROM not found, EEPROM_GP=3D0x%08x", gp); -+ IWL_ERROR("EEPROM not found, EEPROM_GP=3D0x%08x\n", gp); + u32 gp = iwl_read32(priv, CSR_EEPROM_GP); + if ((gp & CSR_EEPROM_GP_VALID_MSK) == CSR_EEPROM_GP_BAD_SIGNATURE) { +- IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x", gp); ++ IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x\n", gp); return -ENOENT; } return 0; @@ -227,7 +226,7 @@ int iwl_eeprom_init(struct iwl_priv *priv) -=20 - ret =3D priv->cfg->ops->lib->eeprom_ops.verify_signature(priv); + + ret = priv->cfg->ops->lib->eeprom_ops.verify_signature(priv); if (ret < 0) { -- IWL_ERROR("EEPROM not found, EEPROM_GP=3D0x%08x", gp); -+ IWL_ERROR("EEPROM not found, EEPROM_GP=3D0x%08x\n", gp); - ret =3D -ENOENT; +- IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x", gp); ++ IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x\n", gp); + ret = -ENOENT; goto err; } @@ -254,7 +253,7 @@ int iwl_eeprom_init(struct iwl_priv *priv) } -=20 + if (!(r & CSR_EEPROM_REG_READ_VALID_MSK)) { - IWL_ERROR("Time out reading EEPROM[%d]", addr); + IWL_ERROR("Time out reading EEPROM[%d]\n", addr); - ret =3D -ETIMEDOUT; + ret = -ETIMEDOUT; goto done; } -diff --git a/drivers/net/wireless/iwlwifi/iwl-hcmd.c b/drivers/net/wire= -less/iwlwifi/iwl-hcmd.c +diff --git a/drivers/net/wireless/iwlwifi/iwl-hcmd.c b/drivers/net/wireless/iwlwifi/iwl-hcmd.c index 6512834..2eb03ee 100644 --- a/drivers/net/wireless/iwlwifi/iwl-hcmd.c +++ b/drivers/net/wireless/iwlwifi/iwl-hcmd.c @@ -28,7 +28,6 @@ -=20 + #include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <net/mac80211.h> -=20 + #include "iwl-dev.h" /* FIXME: remove */ -diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wir= -eless/iwlwifi/iwl-power.c +diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c index 028e305..a099c9e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-power.c +++ b/drivers/net/wireless/iwlwifi/iwl-power.c @@ -29,7 +29,6 @@ -=20 + #include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> -=20 + #include <net/mac80211.h> -diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wirel= -ess/iwlwifi/iwl-sta.c +diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c index 60a6e01..6283a3a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-sta.c -@@ -207,7 +207,7 @@ static void iwl_set_ht_add_station(struct iwl_priv = -*priv, u8 index, +@@ -207,7 +207,7 @@ static void iwl_set_ht_add_station(struct iwl_priv *priv, u8 index, case WLAN_HT_CAP_MIMO_PS_DISABLED: break; default: @@ -412,165 +377,152 @@ index 60a6e01..6283a3a 100644 + IWL_WARNING("Invalid MIMO PS mode %d\n", mimo_ps_mode); break; } -=20 -@@ -969,7 +969,7 @@ int iwl_get_sta_id(struct iwl_priv *priv, struct ie= -ee80211_hdr *hdr) + +@@ -969,7 +969,7 @@ int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr) return priv->hw_params.bcast_sta_id; -=20 + default: - IWL_WARNING("Unknown mode of operation: %d", priv->iw_mode); + IWL_WARNING("Unknown mode of operation: %d\n", priv->iw_mode); return priv->hw_params.bcast_sta_id; } } -diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wirele= -ss/iwlwifi/iwl-tx.c +diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c index 4108c7c..d82823b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-tx.c @@ -493,7 +493,7 @@ int iwl_txq_ctx_reset(struct iwl_priv *priv) /* Alloc keep-warm buffer */ - ret =3D iwl_kw_alloc(priv); + ret = iwl_kw_alloc(priv); if (ret) { - IWL_ERROR("Keep Warm allocation failed"); + IWL_ERROR("Keep Warm allocation failed\n"); goto error_kw; } spin_lock_irqsave(&priv->lock, flags); -@@ -1463,7 +1463,7 @@ void iwl_rx_reply_compressed_ba(struct iwl_priv *= -priv, - u16 ba_resp_scd_ssn =3D le16_to_cpu(ba_resp->scd_ssn); -=20 - if (scd_flow >=3D priv->hw_params.max_txq_num) { +@@ -1463,7 +1463,7 @@ void iwl_rx_reply_compressed_ba(struct iwl_priv *priv, + u16 ba_resp_scd_ssn = le16_to_cpu(ba_resp->scd_ssn); + + if (scd_flow >= priv->hw_params.max_txq_num) { - IWL_ERROR("BUG_ON scd_flow is bigger than number of queues"); + IWL_ERROR("BUG_ON scd_flow is bigger than number of queues\n"); return; } -=20 -diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/= -wireless/iwlwifi/iwl3945-base.c + +diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 444847a..b775d5b 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -29,7 +29,6 @@ -=20 + #include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> #include <linux/pci.h> #include <linux/dma-mapping.h> -@@ -1558,7 +1557,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv= -) - BUILD_BUG_ON(sizeof(priv->eeprom) !=3D IWL_EEPROM_IMAGE_SIZE); -=20 - if ((gp & CSR_EEPROM_GP_VALID_MSK) =3D=3D CSR_EEPROM_GP_BAD_SIGNATURE= -) { -- IWL_ERROR("EEPROM not found, EEPROM_GP=3D0x%08x", gp); -+ IWL_ERROR("EEPROM not found, EEPROM_GP=3D0x%08x\n", gp); +@@ -1558,7 +1557,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv) + BUILD_BUG_ON(sizeof(priv->eeprom) != IWL_EEPROM_IMAGE_SIZE); + + if ((gp & CSR_EEPROM_GP_VALID_MSK) == CSR_EEPROM_GP_BAD_SIGNATURE) { +- IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x", gp); ++ IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x\n", gp); return -ENOENT; } -=20 -@@ -1583,7 +1582,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv= -) + +@@ -1583,7 +1582,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv) } -=20 + if (!(r & CSR_EEPROM_REG_READ_VALID_MSK)) { - IWL_ERROR("Time out reading EEPROM[%d]", addr); + IWL_ERROR("Time out reading EEPROM[%d]\n", addr); return -ETIMEDOUT; } - e[addr / 2] =3D le16_to_cpu((__force __le16)(r >> 16)); -@@ -2507,7 +2506,7 @@ static int iwl3945_get_sta_id(struct iwl3945_priv= - *priv, struct ieee80211_hdr *h + e[addr / 2] = le16_to_cpu((__force __le16)(r >> 16)); +@@ -2507,7 +2506,7 @@ static int iwl3945_get_sta_id(struct iwl3945_priv *priv, struct ieee80211_hdr *h return priv->hw_setting.bcast_sta_id; -=20 + default: - IWL_WARNING("Unknown mode of operation: %d", priv->iw_mode); + IWL_WARNING("Unknown mode of operation: %d\n", priv->iw_mode); return priv->hw_setting.bcast_sta_id; } } -diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireles= -s/p54/p54common.c +diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c index 83cd85e..29be3dc 100644 --- a/drivers/net/wireless/p54/p54common.c +++ b/drivers/net/wireless/p54/p54common.c -@@ -413,12 +413,12 @@ static void p54_rx_frame_sent(struct ieee80211_hw= - *dev, struct sk_buff *skb) - last_addr =3D range->end_addr; +@@ -413,12 +413,12 @@ static void p54_rx_frame_sent(struct ieee80211_hw *dev, struct sk_buff *skb) + last_addr = range->end_addr; __skb_unlink(entry, &priv->tx_queue); memset(&info->status, 0, sizeof(info->status)); - priv->tx_stats[skb_get_queue_mapping(skb)].len--; - entry_hdr =3D (struct p54_control_hdr *) entry->data; - entry_data =3D (struct p54_tx_control_allocdata *) entry_hdr->data; - if ((entry_hdr->magic1 & cpu_to_le16(0x4000)) !=3D 0) - pad =3D entry_data->align[0]; -=20 + entry_hdr = (struct p54_control_hdr *) entry->data; + entry_data = (struct p54_tx_control_allocdata *) entry_hdr->data; + if ((entry_hdr->magic1 & cpu_to_le16(0x4000)) != 0) + pad = entry_data->align[0]; + + priv->tx_stats[entry_data->hw_queue - 4].len--; if (!(info->flags & IEEE80211_TX_CTL_NO_ACK)) { if (!(payload->status & 0x01)) - info->flags |=3D IEEE80211_TX_STAT_ACK; -@@ -557,6 +557,7 @@ static int p54_tx(struct ieee80211_hw *dev, struct = -sk_buff *skb) + info->flags |= IEEE80211_TX_STAT_ACK; +@@ -557,6 +557,7 @@ static int p54_tx(struct ieee80211_hw *dev, struct sk_buff *skb) struct p54_tx_control_allocdata *txhdr; size_t padding, len; u8 rate; -+ u8 cts_rate =3D 0x20; -=20 - current_queue =3D &priv->tx_stats[skb_get_queue_mapping(skb)]; ++ u8 cts_rate = 0x20; + + current_queue = &priv->tx_stats[skb_get_queue_mapping(skb)]; if (unlikely(current_queue->len > current_queue->limit)) -@@ -581,28 +582,28 @@ static int p54_tx(struct ieee80211_hw *dev, struc= -t sk_buff *skb) - hdr->type =3D (info->flags & IEEE80211_TX_CTL_NO_ACK) ? 0 : cpu_to_le= -16(1); - hdr->retry1 =3D hdr->retry2 =3D info->control.retry_limit; -=20 +@@ -581,28 +582,28 @@ static int p54_tx(struct ieee80211_hw *dev, struct sk_buff *skb) + hdr->type = (info->flags & IEEE80211_TX_CTL_NO_ACK) ? 0 : cpu_to_le16(1); + hdr->retry1 = hdr->retry2 = info->control.retry_limit; + - memset(txhdr->wep_key, 0x0, 16); -- txhdr->padding =3D 0; -- txhdr->padding2 =3D 0; +- txhdr->padding = 0; +- txhdr->padding2 = 0; - /* TODO: add support for alternate retry TX rates */ - rate =3D ieee80211_get_tx_rate(dev, info)->hw_value; + rate = ieee80211_get_tx_rate(dev, info)->hw_value; - if (info->flags & IEEE80211_TX_CTL_SHORT_PREAMBLE) + if (info->flags & IEEE80211_TX_CTL_SHORT_PREAMBLE) { - rate |=3D 0x10; + rate |= 0x10; - if (info->flags & IEEE80211_TX_CTL_USE_RTS_CTS) -+ cts_rate |=3D 0x10; ++ cts_rate |= 0x10; + } + if (info->flags & IEEE80211_TX_CTL_USE_RTS_CTS) { - rate |=3D 0x40; + rate |= 0x40; - else if (info->flags & IEEE80211_TX_CTL_USE_CTS_PROTECT) -+ cts_rate |=3D ieee80211_get_rts_cts_rate(dev, info)->hw_value; ++ cts_rate |= ieee80211_get_rts_cts_rate(dev, info)->hw_value; + } else if (info->flags & IEEE80211_TX_CTL_USE_CTS_PROTECT) { - rate |=3D 0x20; -+ cts_rate |=3D ieee80211_get_rts_cts_rate(dev, info)->hw_value; + rate |= 0x20; ++ cts_rate |= ieee80211_get_rts_cts_rate(dev, info)->hw_value; + } memset(txhdr->rateset, rate, 8); -- txhdr->wep_key_present =3D 0; -- txhdr->wep_key_len =3D 0; -- txhdr->frame_type =3D cpu_to_le32(skb_get_queue_mapping(skb) + 4); -- txhdr->magic4 =3D 0; -- txhdr->antenna =3D (info->antenna_sel_tx =3D=3D 0) ? -+ txhdr->key_type =3D 0; -+ txhdr->key_len =3D 0; -+ txhdr->hw_queue =3D skb_get_queue_mapping(skb) + 4; -+ txhdr->tx_antenna =3D (info->antenna_sel_tx =3D=3D 0) ? +- txhdr->wep_key_present = 0; +- txhdr->wep_key_len = 0; +- txhdr->frame_type = cpu_to_le32(skb_get_queue_mapping(skb) + 4); +- txhdr->magic4 = 0; +- txhdr->antenna = (info->antenna_sel_tx == 0) ? ++ txhdr->key_type = 0; ++ txhdr->key_len = 0; ++ txhdr->hw_queue = skb_get_queue_mapping(skb) + 4; ++ txhdr->tx_antenna = (info->antenna_sel_tx == 0) ? 2 : info->antenna_sel_tx - 1; - txhdr->output_power =3D 0x7f; // HW Maximum -- txhdr->magic5 =3D (info->flags & IEEE80211_TX_CTL_NO_ACK) ? + txhdr->output_power = 0x7f; // HW Maximum +- txhdr->magic5 = (info->flags & IEEE80211_TX_CTL_NO_ACK) ? - 0 : ((rate > 0x3) ? cpu_to_le32(0x33) : cpu_to_le32(0x23)); -+ txhdr->cts_rate =3D (info->flags & IEEE80211_TX_CTL_NO_ACK) ? ++ txhdr->cts_rate = (info->flags & IEEE80211_TX_CTL_NO_ACK) ? + 0 : cts_rate; if (padding) - txhdr->align[0] =3D padding; -=20 + txhdr->align[0] = padding; + @@ -836,10 +837,21 @@ static int p54_start(struct ieee80211_hw *dev) - struct p54_common *priv =3D dev->priv; + struct p54_common *priv = dev->priv; int err; -=20 + + if (!priv->cached_vdcf) { -+ priv->cached_vdcf =3D kzalloc(sizeof(struct p54_tx_control_vdcf)+ ++ priv->cached_vdcf = kzalloc(sizeof(struct p54_tx_control_vdcf)+ + priv->tx_hdr_len + sizeof(struct p54_control_hdr), + GFP_KERNEL); + @@ -578,24 +530,21 @@ t sk_buff *skb) + return -ENOMEM; + } + - err =3D priv->open(dev); + err = priv->open(dev); if (!err) - priv->mode =3D IEEE80211_IF_TYPE_MNTR; -=20 + priv->mode = IEEE80211_IF_TYPE_MNTR; + + p54_init_vdcf(dev); + return err; } -=20 -@@ -1019,15 +1031,6 @@ struct ieee80211_hw *p54_init_common(size_t priv= -_data_len) - dev->extra_tx_headroom =3D sizeof(struct p54_control_hdr) + 4 + + +@@ -1019,15 +1031,6 @@ struct ieee80211_hw *p54_init_common(size_t priv_data_len) + dev->extra_tx_headroom = sizeof(struct p54_control_hdr) + 4 + sizeof(struct p54_tx_control_allocdata); -=20 -- priv->cached_vdcf =3D kzalloc(sizeof(struct p54_tx_control_vdc= -f) + -- priv->tx_hdr_len + sizeof(struct p54_control_hdr), GFP_K= -ERNEL); + +- priv->cached_vdcf = kzalloc(sizeof(struct p54_tx_control_vdcf) + +- priv->tx_hdr_len + sizeof(struct p54_control_hdr), GFP_KERNEL); - - if (!priv->cached_vdcf) { - ieee80211_free_hw(dev); @@ -604,15 +553,14 @@ ERNEL); - - p54_init_vdcf(dev); mutex_init(&priv->conf_mutex); -=20 + return dev; -diff --git a/drivers/net/wireless/p54/p54common.h b/drivers/net/wireles= -s/p54/p54common.h +diff --git a/drivers/net/wireless/p54/p54common.h b/drivers/net/wireless/p54/p54common.h index 2245fcc..8db6c0e 100644 --- a/drivers/net/wireless/p54/p54common.h +++ b/drivers/net/wireless/p54/p54common.h @@ -183,16 +183,16 @@ struct p54_frame_sent_hdr { -=20 + struct p54_tx_control_allocdata { u8 rateset[8]; - u16 padding; @@ -636,14 +584,13 @@ index 2245fcc..8db6c0e 100644 + u8 unalloc2[3]; u8 align[0]; } __attribute__ ((packed)); -=20 -diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p= -54/p54usb.c + +diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c index 815c095..cbaca23 100644 --- a/drivers/net/wireless/p54/p54usb.c +++ b/drivers/net/wireless/p54/p54usb.c @@ -109,7 +109,17 @@ static void p54u_rx_cb(struct urb *urb) - urb->context =3D skb; + urb->context = skb; skb_queue_tail(&priv->rx_queue, skb); } else { + if (!priv->hw_type) @@ -651,17 +598,16 @@ index 815c095..cbaca23 100644 + + skb_reset_tail_pointer(skb); skb_trim(skb, 0); -+ if (urb->transfer_buffer !=3D skb_tail_pointer(skb)) { ++ if (urb->transfer_buffer != skb_tail_pointer(skb)) { + /* this should not happen */ + WARN_ON(1); -+ urb->transfer_buffer =3D skb_tail_pointer(skb); ++ urb->transfer_buffer = skb_tail_pointer(skb); + } + skb_queue_tail(&priv->rx_queue, skb); } -=20 -diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wi= -reless/rt2x00/rt2x00queue.h + +diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wireless/rt2x00/rt2x00queue.h index a4a8c57..ff78e52 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.h +++ b/drivers/net/wireless/rt2x00/rt2x00queue.h @@ -669,71 +615,66 @@ index a4a8c57..ff78e52 100644 * frame transmission failed due to excessive retries. */ enum txdone_entry_desc_flags { -- TXDONE_UNKNOWN =3D 1 << 0, -- TXDONE_SUCCESS =3D 1 << 1, -- TXDONE_FAILURE =3D 1 << 2, -- TXDONE_EXCESSIVE_RETRY =3D 1 << 3, +- TXDONE_UNKNOWN = 1 << 0, +- TXDONE_SUCCESS = 1 << 1, +- TXDONE_FAILURE = 1 << 2, +- TXDONE_EXCESSIVE_RETRY = 1 << 3, + TXDONE_UNKNOWN, + TXDONE_SUCCESS, + TXDONE_FAILURE, + TXDONE_EXCESSIVE_RETRY, }; -=20 + /** -diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wire= -less/rt2x00/rt2x00usb.c +diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c index 8d76bb2..2050227 100644 --- a/drivers/net/wireless/rt2x00/rt2x00usb.c +++ b/drivers/net/wireless/rt2x00/rt2x00usb.c -@@ -181,6 +181,7 @@ static void rt2x00usb_interrupt_txdone(struct urb *= -urb) +@@ -181,6 +181,7 @@ static void rt2x00usb_interrupt_txdone(struct urb *urb) * (Only indirectly by looking at the failed TX counters * in the register). */ -+ txdesc.flags =3D 0; ++ txdesc.flags = 0; if (!urb->status) __set_bit(TXDONE_UNKNOWN, &txdesc.flags); else -diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/= -rtl8187_dev.c +diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c index 57376fb..ca5deb6 100644 --- a/drivers/net/wireless/rtl8187_dev.c +++ b/drivers/net/wireless/rtl8187_dev.c -@@ -40,6 +40,7 @@ static struct usb_device_id rtl8187_table[] __devinit= -data =3D { +@@ -40,6 +40,7 @@ static struct usb_device_id rtl8187_table[] __devinitdata = { /* Netgear */ - {USB_DEVICE(0x0846, 0x6100), .driver_info =3D DEVICE_RTL8187}, - {USB_DEVICE(0x0846, 0x6a00), .driver_info =3D DEVICE_RTL8187}, -+ {USB_DEVICE(0x0846, 0x4260), .driver_info =3D DEVICE_RTL8187B}, + {USB_DEVICE(0x0846, 0x6100), .driver_info = DEVICE_RTL8187}, + {USB_DEVICE(0x0846, 0x6a00), .driver_info = DEVICE_RTL8187}, ++ {USB_DEVICE(0x0846, 0x4260), .driver_info = DEVICE_RTL8187B}, /* HP */ - {USB_DEVICE(0x03f0, 0xca02), .driver_info =3D DEVICE_RTL8187}, + {USB_DEVICE(0x03f0, 0xca02), .driver_info = DEVICE_RTL8187}, /* Sitecom */ diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c index d831a2b..87ab244 100644 --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c @@ -1165,15 +1165,19 @@ EXPORT_SYMBOL(ssb_dma_translation); -=20 + int ssb_dma_set_mask(struct ssb_device *dev, u64 mask) { +#ifdef CONFIG_SSB_PCIHOST int err; +#endif -=20 + switch (dev->bus->bustype) { case SSB_BUSTYPE_PCI: +#ifdef CONFIG_SSB_PCIHOST - err =3D pci_set_dma_mask(dev->bus->host_pci, mask); + err = pci_set_dma_mask(dev->bus->host_pci, mask); if (err) return err; - err =3D pci_set_consistent_dma_mask(dev->bus->host_pci, mask); + err = pci_set_consistent_dma_mask(dev->bus->host_pci, mask); return err; +#endif case SSB_BUSTYPE_SSB: return dma_set_mask(dev->dev, mask); default: -@@ -1188,6 +1192,7 @@ void * ssb_dma_alloc_consistent(struct ssb_device= - *dev, size_t size, +@@ -1188,6 +1192,7 @@ void * ssb_dma_alloc_consistent(struct ssb_device *dev, size_t size, { switch (dev->bus->bustype) { case SSB_BUSTYPE_PCI: @@ -741,8 +682,7 @@ index d831a2b..87ab244 100644 if (gfp_flags & GFP_DMA) { /* Workaround: The PCI API does not support passing * a GFP flag. */ -@@ -1195,6 +1200,7 @@ void * ssb_dma_alloc_consistent(struct ssb_device= - *dev, size_t size, +@@ -1195,6 +1200,7 @@ void * ssb_dma_alloc_consistent(struct ssb_device *dev, size_t size, size, dma_handle, gfp_flags); } return pci_alloc_consistent(dev->bus->host_pci, size, dma_handle); @@ -750,8 +690,7 @@ index d831a2b..87ab244 100644 case SSB_BUSTYPE_SSB: return dma_alloc_coherent(dev->dev, size, dma_handle, gfp_flags); default: -@@ -1210,6 +1216,7 @@ void ssb_dma_free_consistent(struct ssb_device *d= -ev, size_t size, +@@ -1210,6 +1216,7 @@ void ssb_dma_free_consistent(struct ssb_device *dev, size_t size, { switch (dev->bus->bustype) { case SSB_BUSTYPE_PCI: @@ -759,8 +698,7 @@ ev, size_t size, if (gfp_flags & GFP_DMA) { /* Workaround: The PCI API does not support passing * a GFP flag. */ -@@ -1220,6 +1227,7 @@ void ssb_dma_free_consistent(struct ssb_device *d= -ev, size_t size, +@@ -1220,6 +1227,7 @@ void ssb_dma_free_consistent(struct ssb_device *dev, size_t size, pci_free_consistent(dev->bus->host_pci, size, vaddr, dma_handle); return; @@ -783,14 +721,12 @@ index b397e4d..ff137fd 100644 + * the driver can fetch them with ieee80211_get_buffered_bc(). * * @IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE: - * Hardware is not capable of short slot operation on the 2.4 GHz band= -=2E + * Hardware is not capable of short slot operation on the 2.4 GHz band. @@ -1099,10 +1096,8 @@ enum ieee80211_ampdu_mlme_action { * See the section "Frame filtering" for more information. * This callback must be implemented and atomic. * -- * @set_tim: Set TIM bit. If the hardware/firmware takes care of beaco= -n +- * @set_tim: Set TIM bit. If the hardware/firmware takes care of beacon - * generation (that is, %IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE is set) - * mac80211 calls this function when a TIM bit must be set or cleared - * for a given AID. Must be atomic. @@ -803,22 +739,20 @@ diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index e1d11c9..1e97fb9 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c -@@ -2103,6 +2103,8 @@ static void ieee80211_rx_mgmt_assoc_resp(struct i= -eee80211_sub_if_data *sdata, +@@ -2103,6 +2103,8 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, rcu_read_unlock(); return; } + /* update new sta with its last rx activity */ -+ sta->last_rx =3D jiffies; ++ sta->last_rx = jiffies; } -=20 + /* diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c index d2d4565..35a9994 100644 --- a/net/rfkill/rfkill.c +++ b/net/rfkill/rfkill.c -@@ -150,6 +150,8 @@ static void update_rfkill_state(struct rfkill *rfki= -ll) +@@ -150,6 +150,8 @@ static void update_rfkill_state(struct rfkill *rfkill) * calls and handling all the red tape such as issuing notifications * if the call is successful. * @@ -827,19 +761,17 @@ ll) * Note that the @force parameter cannot override a (possibly cached) * state of RFKILL_STATE_HARD_BLOCKED. Any device making use of * RFKILL_STATE_HARD_BLOCKED implements either get_state() or -@@ -168,6 +170,9 @@ static int rfkill_toggle_radio(struct rfkill *rfkil= -l, - int retval =3D 0; +@@ -168,6 +170,9 @@ static int rfkill_toggle_radio(struct rfkill *rfkill, + int retval = 0; enum rfkill_state oldstate, newstate; -=20 + + if (unlikely(rfkill->dev.power.power_state.event & PM_EVENT_SLEEP)) + return -EBUSY; + - oldstate =3D rfkill->state; -=20 + oldstate = rfkill->state; + if (rfkill->get_state && !force && -@@ -214,7 +219,7 @@ static int rfkill_toggle_radio(struct rfkill *rfkil= -l, +@@ -214,7 +219,7 @@ static int rfkill_toggle_radio(struct rfkill *rfkill, * * This function toggles the state of all switches of given type, * unless a specific switch is claimed by userspace (in which case, @@ -852,36 +784,33 @@ l, /** * rfkill_epo - emergency power off all transmitters * -- * This kicks all rfkill devices to RFKILL_STATE_SOFT_BLOCKED, ignorin= -g +- * This kicks all rfkill devices to RFKILL_STATE_SOFT_BLOCKED, ignoring - * everything in its path but rfkill_mutex and rfkill->mutex. -+ * This kicks all non-suspended rfkill devices to RFKILL_STATE_SOFT_BL= -OCKED, ++ * This kicks all non-suspended rfkill devices to RFKILL_STATE_SOFT_BLOCKED, + * ignoring everything in its path but rfkill_mutex and rfkill->mutex. */ void rfkill_epo(void) { @@ -458,13 +463,14 @@ static int rfkill_resume(struct device *dev) - if (dev->power.power_state.event !=3D PM_EVENT_ON) { + if (dev->power.power_state.event != PM_EVENT_ON) { mutex_lock(&rfkill->mutex); -=20 -+ dev->power.power_state.event =3D PM_EVENT_ON; + ++ dev->power.power_state.event = PM_EVENT_ON; + /* restore radio state AND notify everybody */ rfkill_toggle_radio(rfkill, rfkill->state, 1); -=20 + mutex_unlock(&rfkill->mutex); } -=20 -- dev->power.power_state =3D PMSG_ON; + +- dev->power.power_state = PMSG_ON; return 0; } #else ---=20 +-- John W. Linville -linville@tuxdriver.com +linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org -- -To unsubscribe from this list: send the line "unsubscribe linux-wireles= -s" in -the body of a message to majordomo@vger.kernel.org +To unsubscribe from this list: send the line "unsubscribe linux-wireless" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N2/content_digest index 44ecefc..8146214 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,39 +1,37 @@ "ref\020080817185605.GC30679@tuxdriver.com\0" "ref\020080817.151251.204370966.davem@davemloft.net\0" - "From\0John W. Linville <linville@tuxdriver.com>\0" + "ref\020080817.151251.204370966.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org\0" + "From\0John W. Linville <linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>\0" "Subject\0pull request: wireless-2.6 2008-08-18\0" "Date\0Mon, 18 Aug 2008 11:15:51 -0400\0" - "To\0David Miller <davem@davemloft.net>\0" - "Cc\0linux-wireless@vger.kernel.org" - netdev@vger.kernel.org - " linux-kernel@vger.kernel.org\0" + "To\0David Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>\0" + "Cc\0linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" + netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "On Sun, Aug 17, 2008 at 03:12:51PM -0700, David Miller wrote:\n" "\n" "> Two commits in here need a fixup.\n" - ">=20\n" + "> \n" "> Their commit messages reference SHA IDs but do not give a commit\n" "> header line text reference as well.\n" - ">=20\n" + "> \n" "> p54: Fix regression due to commit b19fa1f\n" "> ath5k: Don't fiddle with MSI on suspend/resume.\n" - ">=20\n" + "> \n" "> Please fix this up and give me another pull request, thanks!\n" "\n" "Dave,\n" "\n" - "(Revision 2, commit references in changelogs augmented w/ subject text.=\n" - ")\n" + "(Revision 2, commit references in changelogs augmented w/ subject text.)\n" "\n" - "Here is the latest round of wireless fixes for 2.6.27. The silliest on=\n" - "e\n" + "Here is the latest round of wireless fixes for 2.6.27. The silliest one\n" "is the one from Adrian Bunk, which applies the gcc-related fix to ath9k\n" "again because there were two identical pieces of code to fix -- I guess\n" "I didn't get the joke *facepalm*...\n" "\n" - "I don't think there is anything else remarkable, although I think we fi=\n" - "x\n" + "I don't think there is anything else remarkable, although I think we fix\n" "a couple of the current regressions on LKML.\n" "\n" "Thanks,\n" @@ -48,22 +46,19 @@ "\n" "---\n" "\n" - "The following changes since commit 23197916c447a1623d196e6547781180905f=\n" - "0bb2:\n" + "The following changes since commit 23197916c447a1623d196e6547781180905f0bb2:\n" " Matt Carlson (1):\n" " tg3: Update version to 3.94\n" "\n" "are available in the git repository at:\n" "\n" - " git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.g=\n" - "it master\n" + " git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git master\n" "\n" "Adrian Bunk (1):\n" " ath9k: work around gcc ICEs (again)\n" "\n" "Christian Lamparter (3):\n" - " p54: Fix regression due to \"net: Delete NETDEVICES_MULTIQUEUE kco=\n" - "nfig option\"\n" + " p54: Fix regression due to \"net: Delete NETDEVICES_MULTIQUEUE kconfig option\"\n" " p54: move p54_vdcf_init to the right place.\n" " p54u: reset skb's data/tail pointer on requeue\n" "\n" @@ -84,12 +79,10 @@ "\n" "Larry Finger (2):\n" " b43: Fix for SPROM coding error in Linksys WMP54G (BCM4306/3)\n" - " b43: Fix for another Bluetooth Coexistence SPROM Programming erro=\n" - "r for BCM4306\n" + " b43: Fix for another Bluetooth Coexistence SPROM Programming error for BCM4306\n" "\n" "Luis R. Rodriguez (1):\n" - " mac80211: remove kdoc references to IEEE80211_HW_HOST_GEN_BEACON_=\n" - "TEMPLATE\n" + " mac80211: remove kdoc references to IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE\n" "\n" "Michael Karcher (1):\n" " ath5k: Don't fiddle with MSI on suspend/resume.\n" @@ -97,7 +90,7 @@ "Ron Rindjunsky (1):\n" " mac80211: update new sta's rx timestamp\n" "\n" - "matthieu Barth=E9lemy (1):\n" + "matthieu Barth\303\251lemy (1):\n" " rtl8187: Add USB ID for Netgear WG111V3\n" "\n" " Documentation/rfkill.txt | 5 +++\n" @@ -117,8 +110,7 @@ " drivers/net/wireless/iwlwifi/iwl-sta.c | 4 +-\n" " drivers/net/wireless/iwlwifi/iwl-tx.c | 4 +-\n" " drivers/net/wireless/iwlwifi/iwl3945-base.c | 7 ++--\n" - " drivers/net/wireless/p54/p54common.c | 51 ++++++++++++++-----=\n" - "-------\n" + " drivers/net/wireless/p54/p54common.c | 51 ++++++++++++++------------\n" " drivers/net/wireless/p54/p54common.h | 18 +++++-----\n" " drivers/net/wireless/p54/p54usb.c | 10 +++++\n" " drivers/net/wireless/rt2x00/rt2x00queue.h | 8 ++--\n" @@ -134,40 +126,33 @@ "index 28b6ec8..6fcb306 100644\n" "--- a/Documentation/rfkill.txt\n" "+++ b/Documentation/rfkill.txt\n" - "@@ -363,6 +363,11 @@ This rule exists because users of the rfkill subsy=\n" - "stem expect to get (and set,\n" - " when possible) the overall transmitter rfkill state, not of a particul=\n" - "ar rfkill\n" + "@@ -363,6 +363,11 @@ This rule exists because users of the rfkill subsystem expect to get (and set,\n" + " when possible) the overall transmitter rfkill state, not of a particular rfkill\n" " line.\n" - "=20\n" - "+5. During suspend, the rfkill class will attempt to soft-block the rad=\n" - "io\n" - "+through a call to rfkill->toggle_radio, and will try to restore its pr=\n" - "evious\n" - "+state during resume. After a rfkill class is suspended, it will *not*=\n" - " call\n" + " \n" + "+5. During suspend, the rfkill class will attempt to soft-block the radio\n" + "+through a call to rfkill->toggle_radio, and will try to restore its previous\n" + "+state during resume. After a rfkill class is suspended, it will *not* call\n" "+rfkill->toggle_radio until it is resumed.\n" "+\n" " Example of a WLAN wireless driver connected to the rfkill subsystem:\n" " --------------------------------------------------------------------\n" - "=20\n" - "diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/a=\n" - "th5k/base.c\n" + " \n" + "diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c\n" "index 2028866..b20a45a 100644\n" "--- a/drivers/net/wireless/ath5k/base.c\n" "+++ b/drivers/net/wireless/ath5k/base.c\n" "@@ -40,7 +40,6 @@\n" " *\n" " */\n" - "=20\n" + " \n" "-#include <linux/version.h>\n" " #include <linux/module.h>\n" " #include <linux/delay.h>\n" " #include <linux/hardirq.h>\n" - "@@ -587,7 +586,6 @@ ath5k_pci_suspend(struct pci_dev *pdev, pm_message_=\n" - "t state)\n" + "@@ -587,7 +586,6 @@ ath5k_pci_suspend(struct pci_dev *pdev, pm_message_t state)\n" " \tath5k_stop_hw(sc);\n" - "=20\n" + " \n" " \tfree_irq(pdev->irq, sc);\n" "-\tpci_disable_msi(pdev);\n" " \tpci_save_state(pdev);\n" @@ -176,17 +161,17 @@ "@@ -616,12 +614,10 @@ ath5k_pci_resume(struct pci_dev *pdev)\n" " \t */\n" " \tpci_write_config_byte(pdev, 0x41, 0);\n" - "=20\n" + " \n" "-\tpci_enable_msi(pdev);\n" "-\n" - " \terr =3D request_irq(pdev->irq, ath5k_intr, IRQF_SHARED, \"ath\", sc);\n" + " \terr = request_irq(pdev->irq, ath5k_intr, IRQF_SHARED, \"ath\", sc);\n" " \tif (err) {\n" " \t\tATH5K_ERR(sc, \"request_irq failed\\n\");\n" "-\t\tgoto err_msi;\n" "+\t\tgoto err_no_irq;\n" " \t}\n" - "=20\n" - " \terr =3D ath5k_init(sc);\n" + " \n" + " \terr = ath5k_init(sc);\n" "@@ -642,8 +638,7 @@ ath5k_pci_resume(struct pci_dev *pdev)\n" " \treturn 0;\n" " err_irq:\n" @@ -197,27 +182,24 @@ " \tpci_disable_device(pdev);\n" " \treturn err;\n" " }\n" - "diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath=\n" - "9k/hw.c\n" + "diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c\n" "index bde162f..a17eb13 100644\n" "--- a/drivers/net/wireless/ath9k/hw.c\n" "+++ b/drivers/net/wireless/ath9k/hw.c\n" - "@@ -5017,7 +5017,11 @@ static void ath9k_hw_spur_mitigate(struct ath_ha=\n" - "l *ah,\n" - "=20\n" - " \tfor (i =3D 0; i < 123; i++) {\n" + "@@ -5017,7 +5017,11 @@ static void ath9k_hw_spur_mitigate(struct ath_hal *ah,\n" + " \n" + " \tfor (i = 0; i < 123; i++) {\n" " \t\tif ((cur_vit_mask > lower) && (cur_vit_mask < upper)) {\n" "-\t\t\tif ((abs(cur_vit_mask - bin)) < 75)\n" "+\n" "+\t\t\t/* workaround for gcc bug #37014 */\n" - "+\t\t\tvolatile int tmp =3D abs(cur_vit_mask - bin);\n" + "+\t\t\tvolatile int tmp = abs(cur_vit_mask - bin);\n" "+\n" "+\t\t\tif (tmp < 75)\n" - " \t\t\t\tmask_amt =3D 1;\n" + " \t\t\t\tmask_amt = 1;\n" " \t\t\telse\n" - " \t\t\t\tmask_amt =3D 0;\n" - "diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43=\n" - "/main.c\n" + " \t\t\t\tmask_amt = 0;\n" + "diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c\n" "index 3bf3a86..7205a93 100644\n" "--- a/drivers/net/wireless/b43/main.c\n" "+++ b/drivers/net/wireless/b43/main.c\n" @@ -230,17 +212,16 @@ " #include <linux/wireless.h>\n" " #include <linux/workqueue.h>\n" "@@ -4615,7 +4614,9 @@ static void b43_sprom_fixup(struct ssb_bus *bus)\n" - " \tif (bus->bustype =3D=3D SSB_BUSTYPE_PCI) {\n" - " \t\tpdev =3D bus->host_pci;\n" + " \tif (bus->bustype == SSB_BUSTYPE_PCI) {\n" + " \t\tpdev = bus->host_pci;\n" " \t\tif (IS_PDEV(pdev, BROADCOM, 0x4318, ASUSTEK, 0x100F) ||\n" "+\t\t IS_PDEV(pdev, BROADCOM, 0x4320, DELL, 0x0003) ||\n" " \t\t IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0015) ||\n" "+\t\t IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0014) ||\n" " \t\t IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0013))\n" - " \t\t\tbus->sprom.boardflags_lo &=3D ~B43_BFL_BTCOEXIST;\n" + " \t\t\tbus->sprom.boardflags_lo &= ~B43_BFL_BTCOEXIST;\n" " \t}\n" - "diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2=\n" - "100.c\n" + "diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c\n" "index c6f886e..19a401c 100644\n" "--- a/drivers/net/wireless/ipw2100.c\n" "+++ b/drivers/net/wireless/ipw2100.c\n" @@ -252,170 +233,155 @@ " #include <linux/time.h>\n" " #include <linux/firmware.h>\n" " #include <linux/acpi.h>\n" - "diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2=\n" - "200.c\n" + "diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c\n" "index 36e8d2f..dcce354 100644\n" "--- a/drivers/net/wireless/ipw2200.c\n" "+++ b/drivers/net/wireless/ipw2200.c\n" "@@ -31,7 +31,6 @@\n" - " **********************************************************************=\n" - "********/\n" - "=20\n" + " ******************************************************************************/\n" + " \n" " #include \"ipw2200.h\"\n" "-#include <linux/version.h>\n" - "=20\n" - "=20\n" + " \n" + " \n" " #ifndef KBUILD_EXTMOD\n" - "diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wire=\n" - "less/iwlwifi/iwl-3945.c\n" + "diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c\n" "index b3931f6..3f51f36 100644\n" "--- a/drivers/net/wireless/iwlwifi/iwl-3945.c\n" "+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c\n" "@@ -26,7 +26,6 @@\n" - "=20\n" + " \n" " #include <linux/kernel.h>\n" " #include <linux/module.h>\n" "-#include <linux/version.h>\n" " #include <linux/init.h>\n" " #include <linux/pci.h>\n" " #include <linux/dma-mapping.h>\n" - "diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wire=\n" - "less/iwlwifi/iwl-4965.c\n" + "diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c\n" "index 22bb269..e258122 100644\n" "--- a/drivers/net/wireless/iwlwifi/iwl-4965.c\n" "+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c\n" "@@ -26,7 +26,6 @@\n" - "=20\n" + " \n" " #include <linux/kernel.h>\n" " #include <linux/module.h>\n" "-#include <linux/version.h>\n" " #include <linux/init.h>\n" " #include <linux/pci.h>\n" " #include <linux/dma-mapping.h>\n" - "@@ -967,7 +966,7 @@ static int iwl4965_interpolate_chan(struct iwl_priv=\n" - " *priv, u32 channel,\n" - "=20\n" - " \ts =3D iwl4965_get_sub_band(priv, channel);\n" - " \tif (s >=3D EEPROM_TX_POWER_BANDS) {\n" + "@@ -967,7 +966,7 @@ static int iwl4965_interpolate_chan(struct iwl_priv *priv, u32 channel,\n" + " \n" + " \ts = iwl4965_get_sub_band(priv, channel);\n" + " \tif (s >= EEPROM_TX_POWER_BANDS) {\n" "-\t\tIWL_ERROR(\"Tx Power can not find channel %d \", channel);\n" "+\t\tIWL_ERROR(\"Tx Power can not find channel %d\\n\", channel);\n" " \t\treturn -1;\n" " \t}\n" - "=20\n" - "diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wire=\n" - "less/iwlwifi/iwl-5000.c\n" + " \n" + "diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c\n" "index f3d139b..cbc01a0 100644\n" "--- a/drivers/net/wireless/iwlwifi/iwl-5000.c\n" "+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c\n" "@@ -25,7 +25,6 @@\n" - "=20\n" + " \n" " #include <linux/kernel.h>\n" " #include <linux/module.h>\n" "-#include <linux/version.h>\n" " #include <linux/init.h>\n" " #include <linux/pci.h>\n" " #include <linux/dma-mapping.h>\n" - "diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wirel=\n" - "ess/iwlwifi/iwl-agn.c\n" + "diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c\n" "index ed09e48..061ffba 100644\n" "--- a/drivers/net/wireless/iwlwifi/iwl-agn.c\n" "+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c\n" "@@ -29,7 +29,6 @@\n" - "=20\n" + " \n" " #include <linux/kernel.h>\n" " #include <linux/module.h>\n" "-#include <linux/version.h>\n" " #include <linux/init.h>\n" " #include <linux/pci.h>\n" " #include <linux/dma-mapping.h>\n" - "diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wire=\n" - "less/iwlwifi/iwl-core.c\n" + "diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c\n" "index 9bd6180..c72f725 100644\n" "--- a/drivers/net/wireless/iwlwifi/iwl-core.c\n" "+++ b/drivers/net/wireless/iwlwifi/iwl-core.c\n" "@@ -28,7 +28,6 @@\n" - "=20\n" + " \n" " #include <linux/kernel.h>\n" " #include <linux/module.h>\n" "-#include <linux/version.h>\n" " #include <net/mac80211.h>\n" - "=20\n" + " \n" " struct iwl_priv; /* FIXME: remove */\n" - "diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wi=\n" - "reless/iwlwifi/iwl-eeprom.c\n" + "diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c\n" "index bce5383..3715575 100644\n" "--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c\n" "+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c\n" "@@ -63,7 +63,6 @@\n" - "=20\n" + " \n" " #include <linux/kernel.h>\n" " #include <linux/module.h>\n" "-#include <linux/version.h>\n" " #include <linux/init.h>\n" - "=20\n" + " \n" " #include <net/mac80211.h>\n" - "@@ -146,7 +145,7 @@ int iwlcore_eeprom_verify_signature(struct iwl_priv=\n" - " *priv)\n" + "@@ -146,7 +145,7 @@ int iwlcore_eeprom_verify_signature(struct iwl_priv *priv)\n" " {\n" - " \tu32 gp =3D iwl_read32(priv, CSR_EEPROM_GP);\n" - " \tif ((gp & CSR_EEPROM_GP_VALID_MSK) =3D=3D CSR_EEPROM_GP_BAD_SIGNATURE=\n" - ") {\n" - "-\t\tIWL_ERROR(\"EEPROM not found, EEPROM_GP=3D0x%08x\", gp);\n" - "+\t\tIWL_ERROR(\"EEPROM not found, EEPROM_GP=3D0x%08x\\n\", gp);\n" + " \tu32 gp = iwl_read32(priv, CSR_EEPROM_GP);\n" + " \tif ((gp & CSR_EEPROM_GP_VALID_MSK) == CSR_EEPROM_GP_BAD_SIGNATURE) {\n" + "-\t\tIWL_ERROR(\"EEPROM not found, EEPROM_GP=0x%08x\", gp);\n" + "+\t\tIWL_ERROR(\"EEPROM not found, EEPROM_GP=0x%08x\\n\", gp);\n" " \t\treturn -ENOENT;\n" " \t}\n" " \treturn 0;\n" "@@ -227,7 +226,7 @@ int iwl_eeprom_init(struct iwl_priv *priv)\n" - "=20\n" - " \tret =3D priv->cfg->ops->lib->eeprom_ops.verify_signature(priv);\n" + " \n" + " \tret = priv->cfg->ops->lib->eeprom_ops.verify_signature(priv);\n" " \tif (ret < 0) {\n" - "-\t\tIWL_ERROR(\"EEPROM not found, EEPROM_GP=3D0x%08x\", gp);\n" - "+\t\tIWL_ERROR(\"EEPROM not found, EEPROM_GP=3D0x%08x\\n\", gp);\n" - " \t\tret =3D -ENOENT;\n" + "-\t\tIWL_ERROR(\"EEPROM not found, EEPROM_GP=0x%08x\", gp);\n" + "+\t\tIWL_ERROR(\"EEPROM not found, EEPROM_GP=0x%08x\\n\", gp);\n" + " \t\tret = -ENOENT;\n" " \t\tgoto err;\n" " \t}\n" "@@ -254,7 +253,7 @@ int iwl_eeprom_init(struct iwl_priv *priv)\n" " \t\t}\n" - "=20\n" + " \n" " \t\tif (!(r & CSR_EEPROM_REG_READ_VALID_MSK)) {\n" "-\t\t\tIWL_ERROR(\"Time out reading EEPROM[%d]\", addr);\n" "+\t\t\tIWL_ERROR(\"Time out reading EEPROM[%d]\\n\", addr);\n" - " \t\t\tret =3D -ETIMEDOUT;\n" + " \t\t\tret = -ETIMEDOUT;\n" " \t\t\tgoto done;\n" " \t\t}\n" - "diff --git a/drivers/net/wireless/iwlwifi/iwl-hcmd.c b/drivers/net/wire=\n" - "less/iwlwifi/iwl-hcmd.c\n" + "diff --git a/drivers/net/wireless/iwlwifi/iwl-hcmd.c b/drivers/net/wireless/iwlwifi/iwl-hcmd.c\n" "index 6512834..2eb03ee 100644\n" "--- a/drivers/net/wireless/iwlwifi/iwl-hcmd.c\n" "+++ b/drivers/net/wireless/iwlwifi/iwl-hcmd.c\n" "@@ -28,7 +28,6 @@\n" - "=20\n" + " \n" " #include <linux/kernel.h>\n" " #include <linux/module.h>\n" "-#include <linux/version.h>\n" " #include <net/mac80211.h>\n" - "=20\n" + " \n" " #include \"iwl-dev.h\" /* FIXME: remove */\n" - "diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wir=\n" - "eless/iwlwifi/iwl-power.c\n" + "diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c\n" "index 028e305..a099c9e 100644\n" "--- a/drivers/net/wireless/iwlwifi/iwl-power.c\n" "+++ b/drivers/net/wireless/iwlwifi/iwl-power.c\n" "@@ -29,7 +29,6 @@\n" - "=20\n" + " \n" " #include <linux/kernel.h>\n" " #include <linux/module.h>\n" "-#include <linux/version.h>\n" " #include <linux/init.h>\n" - "=20\n" + " \n" " #include <net/mac80211.h>\n" - "diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wirel=\n" - "ess/iwlwifi/iwl-sta.c\n" + "diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c\n" "index 60a6e01..6283a3a 100644\n" "--- a/drivers/net/wireless/iwlwifi/iwl-sta.c\n" "+++ b/drivers/net/wireless/iwlwifi/iwl-sta.c\n" - "@@ -207,7 +207,7 @@ static void iwl_set_ht_add_station(struct iwl_priv =\n" - "*priv, u8 index,\n" + "@@ -207,7 +207,7 @@ static void iwl_set_ht_add_station(struct iwl_priv *priv, u8 index,\n" " \tcase WLAN_HT_CAP_MIMO_PS_DISABLED:\n" " \t\tbreak;\n" " \tdefault:\n" @@ -423,165 +389,152 @@ "+\t\tIWL_WARNING(\"Invalid MIMO PS mode %d\\n\", mimo_ps_mode);\n" " \t\tbreak;\n" " \t}\n" - "=20\n" - "@@ -969,7 +969,7 @@ int iwl_get_sta_id(struct iwl_priv *priv, struct ie=\n" - "ee80211_hdr *hdr)\n" + " \n" + "@@ -969,7 +969,7 @@ int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)\n" " \t\treturn priv->hw_params.bcast_sta_id;\n" - "=20\n" + " \n" " \tdefault:\n" "-\t\tIWL_WARNING(\"Unknown mode of operation: %d\", priv->iw_mode);\n" "+\t\tIWL_WARNING(\"Unknown mode of operation: %d\\n\", priv->iw_mode);\n" " \t\treturn priv->hw_params.bcast_sta_id;\n" " \t}\n" " }\n" - "diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wirele=\n" - "ss/iwlwifi/iwl-tx.c\n" + "diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c\n" "index 4108c7c..d82823b 100644\n" "--- a/drivers/net/wireless/iwlwifi/iwl-tx.c\n" "+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c\n" "@@ -493,7 +493,7 @@ int iwl_txq_ctx_reset(struct iwl_priv *priv)\n" " \t/* Alloc keep-warm buffer */\n" - " \tret =3D iwl_kw_alloc(priv);\n" + " \tret = iwl_kw_alloc(priv);\n" " \tif (ret) {\n" "-\t\tIWL_ERROR(\"Keep Warm allocation failed\");\n" "+\t\tIWL_ERROR(\"Keep Warm allocation failed\\n\");\n" " \t\tgoto error_kw;\n" " \t}\n" " \tspin_lock_irqsave(&priv->lock, flags);\n" - "@@ -1463,7 +1463,7 @@ void iwl_rx_reply_compressed_ba(struct iwl_priv *=\n" - "priv,\n" - " \tu16 ba_resp_scd_ssn =3D le16_to_cpu(ba_resp->scd_ssn);\n" - "=20\n" - " \tif (scd_flow >=3D priv->hw_params.max_txq_num) {\n" + "@@ -1463,7 +1463,7 @@ void iwl_rx_reply_compressed_ba(struct iwl_priv *priv,\n" + " \tu16 ba_resp_scd_ssn = le16_to_cpu(ba_resp->scd_ssn);\n" + " \n" + " \tif (scd_flow >= priv->hw_params.max_txq_num) {\n" "-\t\tIWL_ERROR(\"BUG_ON scd_flow is bigger than number of queues\");\n" "+\t\tIWL_ERROR(\"BUG_ON scd_flow is bigger than number of queues\\n\");\n" " \t\treturn;\n" " \t}\n" - "=20\n" - "diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/=\n" - "wireless/iwlwifi/iwl3945-base.c\n" + " \n" + "diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c\n" "index 444847a..b775d5b 100644\n" "--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c\n" "+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c\n" "@@ -29,7 +29,6 @@\n" - "=20\n" + " \n" " #include <linux/kernel.h>\n" " #include <linux/module.h>\n" "-#include <linux/version.h>\n" " #include <linux/init.h>\n" " #include <linux/pci.h>\n" " #include <linux/dma-mapping.h>\n" - "@@ -1558,7 +1557,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv=\n" - ")\n" - " \tBUILD_BUG_ON(sizeof(priv->eeprom) !=3D IWL_EEPROM_IMAGE_SIZE);\n" - "=20\n" - " \tif ((gp & CSR_EEPROM_GP_VALID_MSK) =3D=3D CSR_EEPROM_GP_BAD_SIGNATURE=\n" - ") {\n" - "-\t\tIWL_ERROR(\"EEPROM not found, EEPROM_GP=3D0x%08x\", gp);\n" - "+\t\tIWL_ERROR(\"EEPROM not found, EEPROM_GP=3D0x%08x\\n\", gp);\n" + "@@ -1558,7 +1557,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv)\n" + " \tBUILD_BUG_ON(sizeof(priv->eeprom) != IWL_EEPROM_IMAGE_SIZE);\n" + " \n" + " \tif ((gp & CSR_EEPROM_GP_VALID_MSK) == CSR_EEPROM_GP_BAD_SIGNATURE) {\n" + "-\t\tIWL_ERROR(\"EEPROM not found, EEPROM_GP=0x%08x\", gp);\n" + "+\t\tIWL_ERROR(\"EEPROM not found, EEPROM_GP=0x%08x\\n\", gp);\n" " \t\treturn -ENOENT;\n" " \t}\n" - "=20\n" - "@@ -1583,7 +1582,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv=\n" - ")\n" + " \n" + "@@ -1583,7 +1582,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv)\n" " \t\t}\n" - "=20\n" + " \n" " \t\tif (!(r & CSR_EEPROM_REG_READ_VALID_MSK)) {\n" "-\t\t\tIWL_ERROR(\"Time out reading EEPROM[%d]\", addr);\n" "+\t\t\tIWL_ERROR(\"Time out reading EEPROM[%d]\\n\", addr);\n" " \t\t\treturn -ETIMEDOUT;\n" " \t\t}\n" - " \t\te[addr / 2] =3D le16_to_cpu((__force __le16)(r >> 16));\n" - "@@ -2507,7 +2506,7 @@ static int iwl3945_get_sta_id(struct iwl3945_priv=\n" - " *priv, struct ieee80211_hdr *h\n" + " \t\te[addr / 2] = le16_to_cpu((__force __le16)(r >> 16));\n" + "@@ -2507,7 +2506,7 @@ static int iwl3945_get_sta_id(struct iwl3945_priv *priv, struct ieee80211_hdr *h\n" " \t\treturn priv->hw_setting.bcast_sta_id;\n" - "=20\n" + " \n" " \tdefault:\n" "-\t\tIWL_WARNING(\"Unknown mode of operation: %d\", priv->iw_mode);\n" "+\t\tIWL_WARNING(\"Unknown mode of operation: %d\\n\", priv->iw_mode);\n" " \t\treturn priv->hw_setting.bcast_sta_id;\n" " \t}\n" " }\n" - "diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireles=\n" - "s/p54/p54common.c\n" + "diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c\n" "index 83cd85e..29be3dc 100644\n" "--- a/drivers/net/wireless/p54/p54common.c\n" "+++ b/drivers/net/wireless/p54/p54common.c\n" - "@@ -413,12 +413,12 @@ static void p54_rx_frame_sent(struct ieee80211_hw=\n" - " *dev, struct sk_buff *skb)\n" - " \t\t\tlast_addr =3D range->end_addr;\n" + "@@ -413,12 +413,12 @@ static void p54_rx_frame_sent(struct ieee80211_hw *dev, struct sk_buff *skb)\n" + " \t\t\tlast_addr = range->end_addr;\n" " \t\t\t__skb_unlink(entry, &priv->tx_queue);\n" " \t\t\tmemset(&info->status, 0, sizeof(info->status));\n" "-\t\t\tpriv->tx_stats[skb_get_queue_mapping(skb)].len--;\n" - " \t\t\tentry_hdr =3D (struct p54_control_hdr *) entry->data;\n" - " \t\t\tentry_data =3D (struct p54_tx_control_allocdata *) entry_hdr->data;\n" - " \t\t\tif ((entry_hdr->magic1 & cpu_to_le16(0x4000)) !=3D 0)\n" - " \t\t\t\tpad =3D entry_data->align[0];\n" - "=20\n" + " \t\t\tentry_hdr = (struct p54_control_hdr *) entry->data;\n" + " \t\t\tentry_data = (struct p54_tx_control_allocdata *) entry_hdr->data;\n" + " \t\t\tif ((entry_hdr->magic1 & cpu_to_le16(0x4000)) != 0)\n" + " \t\t\t\tpad = entry_data->align[0];\n" + " \n" "+\t\t\tpriv->tx_stats[entry_data->hw_queue - 4].len--;\n" " \t\t\tif (!(info->flags & IEEE80211_TX_CTL_NO_ACK)) {\n" " \t\t\t\tif (!(payload->status & 0x01))\n" - " \t\t\t\t\tinfo->flags |=3D IEEE80211_TX_STAT_ACK;\n" - "@@ -557,6 +557,7 @@ static int p54_tx(struct ieee80211_hw *dev, struct =\n" - "sk_buff *skb)\n" + " \t\t\t\t\tinfo->flags |= IEEE80211_TX_STAT_ACK;\n" + "@@ -557,6 +557,7 @@ static int p54_tx(struct ieee80211_hw *dev, struct sk_buff *skb)\n" " \tstruct p54_tx_control_allocdata *txhdr;\n" " \tsize_t padding, len;\n" " \tu8 rate;\n" - "+\tu8 cts_rate =3D 0x20;\n" - "=20\n" - " \tcurrent_queue =3D &priv->tx_stats[skb_get_queue_mapping(skb)];\n" + "+\tu8 cts_rate = 0x20;\n" + " \n" + " \tcurrent_queue = &priv->tx_stats[skb_get_queue_mapping(skb)];\n" " \tif (unlikely(current_queue->len > current_queue->limit))\n" - "@@ -581,28 +582,28 @@ static int p54_tx(struct ieee80211_hw *dev, struc=\n" - "t sk_buff *skb)\n" - " \thdr->type =3D (info->flags & IEEE80211_TX_CTL_NO_ACK) ? 0 : cpu_to_le=\n" - "16(1);\n" - " \thdr->retry1 =3D hdr->retry2 =3D info->control.retry_limit;\n" - "=20\n" + "@@ -581,28 +582,28 @@ static int p54_tx(struct ieee80211_hw *dev, struct sk_buff *skb)\n" + " \thdr->type = (info->flags & IEEE80211_TX_CTL_NO_ACK) ? 0 : cpu_to_le16(1);\n" + " \thdr->retry1 = hdr->retry2 = info->control.retry_limit;\n" + " \n" "-\tmemset(txhdr->wep_key, 0x0, 16);\n" - "-\ttxhdr->padding =3D 0;\n" - "-\ttxhdr->padding2 =3D 0;\n" + "-\ttxhdr->padding = 0;\n" + "-\ttxhdr->padding2 = 0;\n" "-\n" " \t/* TODO: add support for alternate retry TX rates */\n" - " \trate =3D ieee80211_get_tx_rate(dev, info)->hw_value;\n" + " \trate = ieee80211_get_tx_rate(dev, info)->hw_value;\n" "-\tif (info->flags & IEEE80211_TX_CTL_SHORT_PREAMBLE)\n" "+\tif (info->flags & IEEE80211_TX_CTL_SHORT_PREAMBLE) {\n" - " \t\trate |=3D 0x10;\n" + " \t\trate |= 0x10;\n" "-\tif (info->flags & IEEE80211_TX_CTL_USE_RTS_CTS)\n" - "+\t\tcts_rate |=3D 0x10;\n" + "+\t\tcts_rate |= 0x10;\n" "+\t}\n" "+\tif (info->flags & IEEE80211_TX_CTL_USE_RTS_CTS) {\n" - " \t\trate |=3D 0x40;\n" + " \t\trate |= 0x40;\n" "-\telse if (info->flags & IEEE80211_TX_CTL_USE_CTS_PROTECT)\n" - "+\t\tcts_rate |=3D ieee80211_get_rts_cts_rate(dev, info)->hw_value;\n" + "+\t\tcts_rate |= ieee80211_get_rts_cts_rate(dev, info)->hw_value;\n" "+\t} else if (info->flags & IEEE80211_TX_CTL_USE_CTS_PROTECT) {\n" - " \t\trate |=3D 0x20;\n" - "+\t\tcts_rate |=3D ieee80211_get_rts_cts_rate(dev, info)->hw_value;\n" + " \t\trate |= 0x20;\n" + "+\t\tcts_rate |= ieee80211_get_rts_cts_rate(dev, info)->hw_value;\n" "+\t}\n" " \tmemset(txhdr->rateset, rate, 8);\n" - "-\ttxhdr->wep_key_present =3D 0;\n" - "-\ttxhdr->wep_key_len =3D 0;\n" - "-\ttxhdr->frame_type =3D cpu_to_le32(skb_get_queue_mapping(skb) + 4);\n" - "-\ttxhdr->magic4 =3D 0;\n" - "-\ttxhdr->antenna =3D (info->antenna_sel_tx =3D=3D 0) ?\n" - "+\ttxhdr->key_type =3D 0;\n" - "+\ttxhdr->key_len =3D 0;\n" - "+\ttxhdr->hw_queue =3D skb_get_queue_mapping(skb) + 4;\n" - "+\ttxhdr->tx_antenna =3D (info->antenna_sel_tx =3D=3D 0) ?\n" + "-\ttxhdr->wep_key_present = 0;\n" + "-\ttxhdr->wep_key_len = 0;\n" + "-\ttxhdr->frame_type = cpu_to_le32(skb_get_queue_mapping(skb) + 4);\n" + "-\ttxhdr->magic4 = 0;\n" + "-\ttxhdr->antenna = (info->antenna_sel_tx == 0) ?\n" + "+\ttxhdr->key_type = 0;\n" + "+\ttxhdr->key_len = 0;\n" + "+\ttxhdr->hw_queue = skb_get_queue_mapping(skb) + 4;\n" + "+\ttxhdr->tx_antenna = (info->antenna_sel_tx == 0) ?\n" " \t\t2 : info->antenna_sel_tx - 1;\n" - " \ttxhdr->output_power =3D 0x7f; // HW Maximum\n" - "-\ttxhdr->magic5 =3D (info->flags & IEEE80211_TX_CTL_NO_ACK) ?\n" + " \ttxhdr->output_power = 0x7f; // HW Maximum\n" + "-\ttxhdr->magic5 = (info->flags & IEEE80211_TX_CTL_NO_ACK) ?\n" "-\t\t0 : ((rate > 0x3) ? cpu_to_le32(0x33) : cpu_to_le32(0x23));\n" - "+\ttxhdr->cts_rate =3D (info->flags & IEEE80211_TX_CTL_NO_ACK) ?\n" + "+\ttxhdr->cts_rate = (info->flags & IEEE80211_TX_CTL_NO_ACK) ?\n" "+\t\t\t 0 : cts_rate;\n" " \tif (padding)\n" - " \t\ttxhdr->align[0] =3D padding;\n" - "=20\n" + " \t\ttxhdr->align[0] = padding;\n" + " \n" "@@ -836,10 +837,21 @@ static int p54_start(struct ieee80211_hw *dev)\n" - " \tstruct p54_common *priv =3D dev->priv;\n" + " \tstruct p54_common *priv = dev->priv;\n" " \tint err;\n" - "=20\n" + " \n" "+\tif (!priv->cached_vdcf) {\n" - "+\t\tpriv->cached_vdcf =3D kzalloc(sizeof(struct p54_tx_control_vdcf)+\n" + "+\t\tpriv->cached_vdcf = kzalloc(sizeof(struct p54_tx_control_vdcf)+\n" "+\t\t\tpriv->tx_hdr_len + sizeof(struct p54_control_hdr),\n" "+\t\t\tGFP_KERNEL);\n" "+\n" @@ -589,24 +542,21 @@ "+\t\t\treturn -ENOMEM;\n" "+\t}\n" "+\n" - " \terr =3D priv->open(dev);\n" + " \terr = priv->open(dev);\n" " \tif (!err)\n" - " \t\tpriv->mode =3D IEEE80211_IF_TYPE_MNTR;\n" - "=20\n" + " \t\tpriv->mode = IEEE80211_IF_TYPE_MNTR;\n" + " \n" "+\tp54_init_vdcf(dev);\n" "+\n" " \treturn err;\n" " }\n" - "=20\n" - "@@ -1019,15 +1031,6 @@ struct ieee80211_hw *p54_init_common(size_t priv=\n" - "_data_len)\n" - " \tdev->extra_tx_headroom =3D sizeof(struct p54_control_hdr) + 4 +\n" + " \n" + "@@ -1019,15 +1031,6 @@ struct ieee80211_hw *p54_init_common(size_t priv_data_len)\n" + " \tdev->extra_tx_headroom = sizeof(struct p54_control_hdr) + 4 +\n" " \t\t\t\t sizeof(struct p54_tx_control_allocdata);\n" - "=20\n" - "- priv->cached_vdcf =3D kzalloc(sizeof(struct p54_tx_control_vdc=\n" - "f) +\n" - "- priv->tx_hdr_len + sizeof(struct p54_control_hdr), GFP_K=\n" - "ERNEL);\n" + " \n" + "- priv->cached_vdcf = kzalloc(sizeof(struct p54_tx_control_vdcf) +\n" + "- priv->tx_hdr_len + sizeof(struct p54_control_hdr), GFP_KERNEL);\n" "-\n" "-\tif (!priv->cached_vdcf) {\n" "-\t\tieee80211_free_hw(dev);\n" @@ -615,15 +565,14 @@ "-\n" "-\tp54_init_vdcf(dev);\n" " \tmutex_init(&priv->conf_mutex);\n" - "=20\n" + " \n" " \treturn dev;\n" - "diff --git a/drivers/net/wireless/p54/p54common.h b/drivers/net/wireles=\n" - "s/p54/p54common.h\n" + "diff --git a/drivers/net/wireless/p54/p54common.h b/drivers/net/wireless/p54/p54common.h\n" "index 2245fcc..8db6c0e 100644\n" "--- a/drivers/net/wireless/p54/p54common.h\n" "+++ b/drivers/net/wireless/p54/p54common.h\n" "@@ -183,16 +183,16 @@ struct p54_frame_sent_hdr {\n" - "=20\n" + " \n" " struct p54_tx_control_allocdata {\n" " \tu8 rateset[8];\n" "-\tu16 padding;\n" @@ -647,14 +596,13 @@ "+\tu8 unalloc2[3];\n" " \tu8 align[0];\n" " } __attribute__ ((packed));\n" - "=20\n" - "diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p=\n" - "54/p54usb.c\n" + " \n" + "diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c\n" "index 815c095..cbaca23 100644\n" "--- a/drivers/net/wireless/p54/p54usb.c\n" "+++ b/drivers/net/wireless/p54/p54usb.c\n" "@@ -109,7 +109,17 @@ static void p54u_rx_cb(struct urb *urb)\n" - " \t\turb->context =3D skb;\n" + " \t\turb->context = skb;\n" " \t\tskb_queue_tail(&priv->rx_queue, skb);\n" " \t} else {\n" "+\t\tif (!priv->hw_type)\n" @@ -662,17 +610,16 @@ "+\n" "+\t\tskb_reset_tail_pointer(skb);\n" " \t\tskb_trim(skb, 0);\n" - "+\t\tif (urb->transfer_buffer !=3D skb_tail_pointer(skb)) {\n" + "+\t\tif (urb->transfer_buffer != skb_tail_pointer(skb)) {\n" "+\t\t\t/* this should not happen */\n" "+\t\t\tWARN_ON(1);\n" - "+\t\t\turb->transfer_buffer =3D skb_tail_pointer(skb);\n" + "+\t\t\turb->transfer_buffer = skb_tail_pointer(skb);\n" "+\t\t}\n" "+\n" " \t\tskb_queue_tail(&priv->rx_queue, skb);\n" " \t}\n" - "=20\n" - "diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wi=\n" - "reless/rt2x00/rt2x00queue.h\n" + " \n" + "diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wireless/rt2x00/rt2x00queue.h\n" "index a4a8c57..ff78e52 100644\n" "--- a/drivers/net/wireless/rt2x00/rt2x00queue.h\n" "+++ b/drivers/net/wireless/rt2x00/rt2x00queue.h\n" @@ -680,71 +627,66 @@ " *\tframe transmission failed due to excessive retries.\n" " */\n" " enum txdone_entry_desc_flags {\n" - "-\tTXDONE_UNKNOWN =3D 1 << 0,\n" - "-\tTXDONE_SUCCESS =3D 1 << 1,\n" - "-\tTXDONE_FAILURE =3D 1 << 2,\n" - "-\tTXDONE_EXCESSIVE_RETRY =3D 1 << 3,\n" + "-\tTXDONE_UNKNOWN = 1 << 0,\n" + "-\tTXDONE_SUCCESS = 1 << 1,\n" + "-\tTXDONE_FAILURE = 1 << 2,\n" + "-\tTXDONE_EXCESSIVE_RETRY = 1 << 3,\n" "+\tTXDONE_UNKNOWN,\n" "+\tTXDONE_SUCCESS,\n" "+\tTXDONE_FAILURE,\n" "+\tTXDONE_EXCESSIVE_RETRY,\n" " };\n" - "=20\n" + " \n" " /**\n" - "diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wire=\n" - "less/rt2x00/rt2x00usb.c\n" + "diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c\n" "index 8d76bb2..2050227 100644\n" "--- a/drivers/net/wireless/rt2x00/rt2x00usb.c\n" "+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c\n" - "@@ -181,6 +181,7 @@ static void rt2x00usb_interrupt_txdone(struct urb *=\n" - "urb)\n" + "@@ -181,6 +181,7 @@ static void rt2x00usb_interrupt_txdone(struct urb *urb)\n" " \t * (Only indirectly by looking at the failed TX counters\n" " \t * in the register).\n" " \t */\n" - "+\ttxdesc.flags =3D 0;\n" + "+\ttxdesc.flags = 0;\n" " \tif (!urb->status)\n" " \t\t__set_bit(TXDONE_UNKNOWN, &txdesc.flags);\n" " \telse\n" - "diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/=\n" - "rtl8187_dev.c\n" + "diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c\n" "index 57376fb..ca5deb6 100644\n" "--- a/drivers/net/wireless/rtl8187_dev.c\n" "+++ b/drivers/net/wireless/rtl8187_dev.c\n" - "@@ -40,6 +40,7 @@ static struct usb_device_id rtl8187_table[] __devinit=\n" - "data =3D {\n" + "@@ -40,6 +40,7 @@ static struct usb_device_id rtl8187_table[] __devinitdata = {\n" " \t/* Netgear */\n" - " \t{USB_DEVICE(0x0846, 0x6100), .driver_info =3D DEVICE_RTL8187},\n" - " \t{USB_DEVICE(0x0846, 0x6a00), .driver_info =3D DEVICE_RTL8187},\n" - "+\t{USB_DEVICE(0x0846, 0x4260), .driver_info =3D DEVICE_RTL8187B},\n" + " \t{USB_DEVICE(0x0846, 0x6100), .driver_info = DEVICE_RTL8187},\n" + " \t{USB_DEVICE(0x0846, 0x6a00), .driver_info = DEVICE_RTL8187},\n" + "+\t{USB_DEVICE(0x0846, 0x4260), .driver_info = DEVICE_RTL8187B},\n" " \t/* HP */\n" - " \t{USB_DEVICE(0x03f0, 0xca02), .driver_info =3D DEVICE_RTL8187},\n" + " \t{USB_DEVICE(0x03f0, 0xca02), .driver_info = DEVICE_RTL8187},\n" " \t/* Sitecom */\n" "diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c\n" "index d831a2b..87ab244 100644\n" "--- a/drivers/ssb/main.c\n" "+++ b/drivers/ssb/main.c\n" "@@ -1165,15 +1165,19 @@ EXPORT_SYMBOL(ssb_dma_translation);\n" - "=20\n" + " \n" " int ssb_dma_set_mask(struct ssb_device *dev, u64 mask)\n" " {\n" "+#ifdef CONFIG_SSB_PCIHOST\n" " \tint err;\n" "+#endif\n" - "=20\n" + " \n" " \tswitch (dev->bus->bustype) {\n" " \tcase SSB_BUSTYPE_PCI:\n" "+#ifdef CONFIG_SSB_PCIHOST\n" - " \t\terr =3D pci_set_dma_mask(dev->bus->host_pci, mask);\n" + " \t\terr = pci_set_dma_mask(dev->bus->host_pci, mask);\n" " \t\tif (err)\n" " \t\t\treturn err;\n" - " \t\terr =3D pci_set_consistent_dma_mask(dev->bus->host_pci, mask);\n" + " \t\terr = pci_set_consistent_dma_mask(dev->bus->host_pci, mask);\n" " \t\treturn err;\n" "+#endif\n" " \tcase SSB_BUSTYPE_SSB:\n" " \t\treturn dma_set_mask(dev->dev, mask);\n" " \tdefault:\n" - "@@ -1188,6 +1192,7 @@ void * ssb_dma_alloc_consistent(struct ssb_device=\n" - " *dev, size_t size,\n" + "@@ -1188,6 +1192,7 @@ void * ssb_dma_alloc_consistent(struct ssb_device *dev, size_t size,\n" " {\n" " \tswitch (dev->bus->bustype) {\n" " \tcase SSB_BUSTYPE_PCI:\n" @@ -752,8 +694,7 @@ " \t\tif (gfp_flags & GFP_DMA) {\n" " \t\t\t/* Workaround: The PCI API does not support passing\n" " \t\t\t * a GFP flag. */\n" - "@@ -1195,6 +1200,7 @@ void * ssb_dma_alloc_consistent(struct ssb_device=\n" - " *dev, size_t size,\n" + "@@ -1195,6 +1200,7 @@ void * ssb_dma_alloc_consistent(struct ssb_device *dev, size_t size,\n" " \t\t\t\t\t\t size, dma_handle, gfp_flags);\n" " \t\t}\n" " \t\treturn pci_alloc_consistent(dev->bus->host_pci, size, dma_handle);\n" @@ -761,8 +702,7 @@ " \tcase SSB_BUSTYPE_SSB:\n" " \t\treturn dma_alloc_coherent(dev->dev, size, dma_handle, gfp_flags);\n" " \tdefault:\n" - "@@ -1210,6 +1216,7 @@ void ssb_dma_free_consistent(struct ssb_device *d=\n" - "ev, size_t size,\n" + "@@ -1210,6 +1216,7 @@ void ssb_dma_free_consistent(struct ssb_device *dev, size_t size,\n" " {\n" " \tswitch (dev->bus->bustype) {\n" " \tcase SSB_BUSTYPE_PCI:\n" @@ -770,8 +710,7 @@ " \t\tif (gfp_flags & GFP_DMA) {\n" " \t\t\t/* Workaround: The PCI API does not support passing\n" " \t\t\t * a GFP flag. */\n" - "@@ -1220,6 +1227,7 @@ void ssb_dma_free_consistent(struct ssb_device *d=\n" - "ev, size_t size,\n" + "@@ -1220,6 +1227,7 @@ void ssb_dma_free_consistent(struct ssb_device *dev, size_t size,\n" " \t\tpci_free_consistent(dev->bus->host_pci, size,\n" " \t\t\t\t vaddr, dma_handle);\n" " \t\treturn;\n" @@ -794,14 +733,12 @@ "+ *\tthe driver can fetch them with ieee80211_get_buffered_bc().\n" " *\n" " * @IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE:\n" - " *\tHardware is not capable of short slot operation on the 2.4 GHz band=\n" - "=2E\n" + " *\tHardware is not capable of short slot operation on the 2.4 GHz band.\n" "@@ -1099,10 +1096,8 @@ enum ieee80211_ampdu_mlme_action {\n" " *\tSee the section \"Frame filtering\" for more information.\n" " *\tThis callback must be implemented and atomic.\n" " *\n" - "- * @set_tim: Set TIM bit. If the hardware/firmware takes care of beaco=\n" - "n\n" + "- * @set_tim: Set TIM bit. If the hardware/firmware takes care of beacon\n" "- *\tgeneration (that is, %IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE is set)\n" "- *\tmac80211 calls this function when a TIM bit must be set or cleared\n" "- *\tfor a given AID. Must be atomic.\n" @@ -814,22 +751,20 @@ "index e1d11c9..1e97fb9 100644\n" "--- a/net/mac80211/mlme.c\n" "+++ b/net/mac80211/mlme.c\n" - "@@ -2103,6 +2103,8 @@ static void ieee80211_rx_mgmt_assoc_resp(struct i=\n" - "eee80211_sub_if_data *sdata,\n" + "@@ -2103,6 +2103,8 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,\n" " \t\t\trcu_read_unlock();\n" " \t\t\treturn;\n" " \t\t}\n" "+\t\t/* update new sta with its last rx activity */\n" - "+\t\tsta->last_rx =3D jiffies;\n" + "+\t\tsta->last_rx = jiffies;\n" " \t}\n" - "=20\n" + " \n" " \t/*\n" "diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c\n" "index d2d4565..35a9994 100644\n" "--- a/net/rfkill/rfkill.c\n" "+++ b/net/rfkill/rfkill.c\n" - "@@ -150,6 +150,8 @@ static void update_rfkill_state(struct rfkill *rfki=\n" - "ll)\n" + "@@ -150,6 +150,8 @@ static void update_rfkill_state(struct rfkill *rfkill)\n" " * calls and handling all the red tape such as issuing notifications\n" " * if the call is successful.\n" " *\n" @@ -838,19 +773,17 @@ " * Note that the @force parameter cannot override a (possibly cached)\n" " * state of RFKILL_STATE_HARD_BLOCKED. Any device making use of\n" " * RFKILL_STATE_HARD_BLOCKED implements either get_state() or\n" - "@@ -168,6 +170,9 @@ static int rfkill_toggle_radio(struct rfkill *rfkil=\n" - "l,\n" - " \tint retval =3D 0;\n" + "@@ -168,6 +170,9 @@ static int rfkill_toggle_radio(struct rfkill *rfkill,\n" + " \tint retval = 0;\n" " \tenum rfkill_state oldstate, newstate;\n" - "=20\n" + " \n" "+\tif (unlikely(rfkill->dev.power.power_state.event & PM_EVENT_SLEEP))\n" "+\t\treturn -EBUSY;\n" "+\n" - " \toldstate =3D rfkill->state;\n" - "=20\n" + " \toldstate = rfkill->state;\n" + " \n" " \tif (rfkill->get_state && !force &&\n" - "@@ -214,7 +219,7 @@ static int rfkill_toggle_radio(struct rfkill *rfkil=\n" - "l,\n" + "@@ -214,7 +219,7 @@ static int rfkill_toggle_radio(struct rfkill *rfkill,\n" " *\n" " * This function toggles the state of all switches of given type,\n" " * unless a specific switch is claimed by userspace (in which case,\n" @@ -863,38 +796,35 @@ " /**\n" " * rfkill_epo - emergency power off all transmitters\n" " *\n" - "- * This kicks all rfkill devices to RFKILL_STATE_SOFT_BLOCKED, ignorin=\n" - "g\n" + "- * This kicks all rfkill devices to RFKILL_STATE_SOFT_BLOCKED, ignoring\n" "- * everything in its path but rfkill_mutex and rfkill->mutex.\n" - "+ * This kicks all non-suspended rfkill devices to RFKILL_STATE_SOFT_BL=\n" - "OCKED,\n" + "+ * This kicks all non-suspended rfkill devices to RFKILL_STATE_SOFT_BLOCKED,\n" "+ * ignoring everything in its path but rfkill_mutex and rfkill->mutex.\n" " */\n" " void rfkill_epo(void)\n" " {\n" "@@ -458,13 +463,14 @@ static int rfkill_resume(struct device *dev)\n" - " \tif (dev->power.power_state.event !=3D PM_EVENT_ON) {\n" + " \tif (dev->power.power_state.event != PM_EVENT_ON) {\n" " \t\tmutex_lock(&rfkill->mutex);\n" - "=20\n" - "+\t\tdev->power.power_state.event =3D PM_EVENT_ON;\n" + " \n" + "+\t\tdev->power.power_state.event = PM_EVENT_ON;\n" "+\n" " \t\t/* restore radio state AND notify everybody */\n" " \t\trfkill_toggle_radio(rfkill, rfkill->state, 1);\n" - "=20\n" + " \n" " \t\tmutex_unlock(&rfkill->mutex);\n" " \t}\n" - "=20\n" - "-\tdev->power.power_state =3D PMSG_ON;\n" + " \n" + "-\tdev->power.power_state = PMSG_ON;\n" " \treturn 0;\n" " }\n" " #else\n" - "--=20\n" + "-- \n" "John W. Linville\n" - "linville@tuxdriver.com\n" + "linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org\n" "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-wireles=\n" - "s\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" + "To unsubscribe from this list: send the line \"unsubscribe linux-wireless\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" More majordomo info at http://vger.kernel.org/majordomo-info.html -9624ddb4d080b16739e0c6cbb0f714cfb40308174e494ffc2bb0f9db229f70ec +6f1dffd25235b8cc893ddc07723828d43b5be67d009ca935b088e3b50585aac5
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.