Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f925938 authored by Winkler, Tomas's avatar Winkler, Tomas Committed by John W. Linville
Browse files

iwlifi: remove twice defined SINGLE_FRAME RX FH MASK 



This patch removes second definition of FH_RCSR_CHNL0_RX_CONFIG_SINGLE_FRAME
in iwl-fh.h

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Reported-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Acked-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 759ef89f

drivers/net/wireless/iwlwifi/iwl-fh.h

+0 −3
Original line number Diff line number Diff line
@@ -266,11 +266,8 @@ 
#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)

 *

drivers/net/wireless/iwlwifi/iwl-rx.c

+1 −1
Original line number Diff line number Diff line
@@ -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));