aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl4965-base.c
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2008-06-30 05:23:10 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-06-30 17:37:40 -0400
commit4b8817b2a06958efd868677880334229fe5a96cf (patch)
tree1a9cef9b89433fccecaeba54d64025cb617baa75 /drivers/net/wireless/iwlwifi/iwl4965-base.c
parent1781a07fbe9cce3dc1697288a5edd260ea7edc02 (diff)
iwlwifi: remove useless network and duplicate checking
The iwlwifi drivers go to great lengths to avoid passing packets to mac80211 they think shouldn't go there, while mac80211 can (of course!) handle them very well. Especially in the case of duplicate packets this is interesting because it's such a performance hog (especially for IBSS networks) while mac80211 does that work on the side without much effort. This patch removes all that and leaves only what is absolutely necessary for the hardware. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl4965-base.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl4965-base.c26
1 files changed, 0 insertions, 26 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 499705ff8887..4129e90f360a 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -613,20 +613,6 @@ static void iwl4965_activate_qos(struct iwl_priv *priv, u8 force)
613 } 613 }
614} 614}
615 615
616static void iwl4965_sequence_reset(struct iwl_priv *priv)
617{
618 /* Reset ieee stats */
619
620 /* We don't reset the net_device_stats (ieee->stats) on
621 * re-association */
622
623 priv->last_seq_num = -1;
624 priv->last_frag_num = -1;
625 priv->last_packet_time = 0;
626
627 iwl_scan_cancel(priv);
628}
629
630#define MAX_UCODE_BEACON_INTERVAL 4096 616#define MAX_UCODE_BEACON_INTERVAL 4096
631#define INTEL_CONN_LISTEN_INTERVAL __constant_cpu_to_le16(0xA) 617#define INTEL_CONN_LISTEN_INTERVAL __constant_cpu_to_le16(0xA)
632 618
@@ -2515,8 +2501,6 @@ static void iwl4965_post_associate(struct iwl_priv *priv)
2515 break; 2501 break;
2516 } 2502 }
2517 2503
2518 iwl4965_sequence_reset(priv);
2519
2520 /* Enable Rx differential gain and sensitivity calibrations */ 2504 /* Enable Rx differential gain and sensitivity calibrations */
2521 iwl_chain_noise_reset(priv); 2505 iwl_chain_noise_reset(priv);
2522 priv->start_calib = 1; 2506 priv->start_calib = 1;
@@ -4337,8 +4321,6 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
4337static void __devexit iwl4965_pci_remove(struct pci_dev *pdev) 4321static void __devexit iwl4965_pci_remove(struct pci_dev *pdev)
4338{ 4322{
4339 struct iwl_priv *priv = pci_get_drvdata(pdev); 4323 struct iwl_priv *priv = pci_get_drvdata(pdev);
4340 struct list_head *p, *q;
4341 int i;
4342 unsigned long flags; 4324 unsigned long flags;
4343 4325
4344 if (!priv) 4326 if (!priv)
@@ -4367,14 +4349,6 @@ static void __devexit iwl4965_pci_remove(struct pci_dev *pdev)
4367 4349
4368 iwl_synchronize_irq(priv); 4350 iwl_synchronize_irq(priv);
4369 4351
4370 /* Free MAC hash list for ADHOC */
4371 for (i = 0; i < IWL_IBSS_MAC_HASH_SIZE; i++) {
4372 list_for_each_safe(p, q, &priv->ibss_mac_hash[i]) {
4373 list_del(p);
4374 kfree(list_entry(p, struct iwl4965_ibss_seq, list));
4375 }
4376 }
4377
4378 iwl_rfkill_unregister(priv); 4352 iwl_rfkill_unregister(priv);
4379 iwl4965_dealloc_ucode_pci(priv); 4353 iwl4965_dealloc_ucode_pci(priv);
4380 4354