aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorAbhijeet Kolekar <abhijeet.kolekar@intel.com>2008-09-08 22:54:52 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-09-11 15:53:38 -0400
commit12e5e22d38577a5a16dd47e7144722817a55e52e (patch)
tree8013d8768077c840b958cfacf416606f38984b35 /drivers/net
parent71b35f3abeb8f7f7e0afd7573424540cc5aae2d5 (diff)
iwl3945 : Code cleanup
Simplify pass_packet_to_mac80211 code block. Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar@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')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-3945.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index 1377c8190ecb..3d100e898249 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -681,19 +681,7 @@ static void iwl3945_rx_reply_rx(struct iwl3945_priv *priv,
681 priv->last_rx_noise = rx_status.noise; 681 priv->last_rx_noise = rx_status.noise;
682 } 682 }
683 683
684 if (priv->iw_mode == IEEE80211_IF_TYPE_MNTR) { 684 iwl3945_pass_packet_to_mac80211(priv, rxb, &rx_status);
685 iwl3945_pass_packet_to_mac80211(priv, rxb, &rx_status);
686 return;
687 }
688
689 switch (le16_to_cpu(header->frame_control) & IEEE80211_FCTL_FTYPE) {
690 case IEEE80211_FTYPE_MGMT:
691 case IEEE80211_FTYPE_DATA:
692 /* fall through */
693 default:
694 iwl3945_pass_packet_to_mac80211(priv, rxb, &rx_status);
695 break;
696 }
697} 685}
698 686
699int iwl3945_hw_txq_attach_buf_to_tfd(struct iwl3945_priv *priv, void *ptr, 687int iwl3945_hw_txq_attach_buf_to_tfd(struct iwl3945_priv *priv, void *ptr,