]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
iwlifi: remove twice defined SINGLE_FRAME RX FH MASK
authorWinkler, Tomas <tomas.winkler@intel.com>
Tue, 9 Dec 2008 19:28:59 +0000 (11:28 -0800)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 12 Dec 2008 19:01:49 +0000 (14:01 -0500)
This patch removes second definition of FH_RCSR_CHNL0_RX_CONFIG_SINGLE_FRAME
in iwl-fh.h

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Reported-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Acked-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-fh.h
drivers/net/wireless/iwlwifi/iwl-rx.c

index 2ff9434fffd2a6ae4b6e853f96f7e1c72b79421a..d7da1986455092ac6b5cfe47582630f436caeffb 100644 (file)
 #define FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_NO_INT_VAL    (0x00000000)
 #define FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_INT_HOST_VAL  (0x00001000)
 
-#define FH_RCSR_CHNL0_RX_CONFIG_SINGLE_FRAME   (0x00008000)
-
 #define FH_RSCSR_FRAME_SIZE_MSK        (0x00003FFF)    /* bits 0-13 */
 
-
 /**
  * Rx Shared Status Registers (RSSR)
  *
index efafb91bd91107184cd89a4a8d4e73563dc01fba..096523200327f78c4815cbf1428b3261ea62c982 100644 (file)
@@ -439,7 +439,7 @@ int iwl_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
                           FH_RCSR_RX_CONFIG_CHNL_EN_ENABLE_VAL |
                           FH_RCSR_CHNL0_RX_IGNORE_RXF_EMPTY |
                           FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_INT_HOST_VAL |
-                          FH_RCSR_CHNL0_RX_CONFIG_SINGLE_FRAME |
+                          FH_RCSR_CHNL0_RX_CONFIG_SINGLE_FRAME_MSK |
                           rb_size|
                           (rb_timeout << FH_RCSR_RX_CONFIG_REG_IRQ_RBTH_POS)|
                           (rfdnlog << FH_RCSR_RX_CONFIG_RBDCB_SIZE_POS));