From: David S. Miller <davem@davemloft.net>
Date: Thu, 4 Feb 2010 16:58:14 +0000 (-0800)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=10be7eb36b93364b98688831ee7d26f58402bb96;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6
---

10be7eb36b93364b98688831ee7d26f58402bb96
diff --cc drivers/net/wireless/iwlwifi/iwl-3945.c
index 6cde661ce0bc,57194bbd2762..6940f086823c
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@@ -2847,9 -2845,10 +2845,10 @@@ static struct iwl_cfg iwl3945_abg_cfg 
  	.ht_greenfield_support = false,
  	.led_compensation = 64,
  	.broken_powersave = true,
+ 	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
  };
  
 -struct pci_device_id iwl3945_hw_card_ids[] = {
 +DEFINE_PCI_DEVICE_TABLE(iwl3945_hw_card_ids) = {
  	{IWL_PCI_DEVICE(0x4222, 0x1005, iwl3945_bg_cfg)},
  	{IWL_PCI_DEVICE(0x4222, 0x1034, iwl3945_bg_cfg)},
  	{IWL_PCI_DEVICE(0x4222, 0x1044, iwl3945_bg_cfg)},