Re: [-mm patch] iwl-base.c bugfixes
On 8/28/07, Adrian Bunk <[EMAIL PROTECTED]> wrote: > On Wed, Aug 22, 2007 at 02:06:48AM -0700, Andrew Morton wrote: > >... > > Changes since 2.6.23-rc2-mm2: > >... > > git-wireless.patch > >... > > git trees > >... > > This patch fixes two obvious bugs. > > Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]> > > --- > > drivers/net/wireless/iwl-base.c |4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > 600ffdc11b25ac0aee15271d1b2ce99a367efa31 > diff --git a/drivers/net/wireless/iwl-base.c b/drivers/net/wireless/iwl-base.c > index b8293fe..f65c30e 100644 > --- a/drivers/net/wireless/iwl-base.c > +++ b/drivers/net/wireless/iwl-base.c > @@ -343,7 +343,7 @@ int iwl_tx_queue_init(struct iwl_priv *priv, > * command is very huge the system will not have two scan at the > * same time */ > len = sizeof(struct iwl_cmd) * slots_num; > - if (txq_id == IWL_CMD_QUEUE_NUM); > + if (txq_id == IWL_CMD_QUEUE_NUM) > len += IWL_MAX_SCAN_SIZE; > txq->cmd = pci_alloc_consistent(dev, len, >dma_addr_cmd); > if (!txq->cmd) > @@ -390,7 +390,7 @@ void iwl_tx_queue_free(struct iwl_priv *priv, struct > iwl_tx_queue *txq) > iwl_hw_txq_free_tfd(priv, txq); > > len = sizeof(struct iwl_cmd) * q->n_window; > - if (q->id == IWL_CMD_QUEUE_NUM); > + if (q->id == IWL_CMD_QUEUE_NUM) > len += IWL_MAX_SCAN_SIZE; > > pci_free_consistent(dev, len, txq->cmd, txq->dma_addr_cmd); > > Shame on me. Thanks > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to [EMAIL PROTECTED] > More majordomo info at http://vger.kernel.org/majordomo-info.html > - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[-mm patch] iwl-base.c bugfixes
On Wed, Aug 22, 2007 at 02:06:48AM -0700, Andrew Morton wrote: >... > Changes since 2.6.23-rc2-mm2: >... > git-wireless.patch >... > git trees >... This patch fixes two obvious bugs. Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]> --- drivers/net/wireless/iwl-base.c |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 600ffdc11b25ac0aee15271d1b2ce99a367efa31 diff --git a/drivers/net/wireless/iwl-base.c b/drivers/net/wireless/iwl-base.c index b8293fe..f65c30e 100644 --- a/drivers/net/wireless/iwl-base.c +++ b/drivers/net/wireless/iwl-base.c @@ -343,7 +343,7 @@ int iwl_tx_queue_init(struct iwl_priv *priv, * command is very huge the system will not have two scan at the * same time */ len = sizeof(struct iwl_cmd) * slots_num; - if (txq_id == IWL_CMD_QUEUE_NUM); + if (txq_id == IWL_CMD_QUEUE_NUM) len += IWL_MAX_SCAN_SIZE; txq->cmd = pci_alloc_consistent(dev, len, >dma_addr_cmd); if (!txq->cmd) @@ -390,7 +390,7 @@ void iwl_tx_queue_free(struct iwl_priv *priv, struct iwl_tx_queue *txq) iwl_hw_txq_free_tfd(priv, txq); len = sizeof(struct iwl_cmd) * q->n_window; - if (q->id == IWL_CMD_QUEUE_NUM); + if (q->id == IWL_CMD_QUEUE_NUM) len += IWL_MAX_SCAN_SIZE; pci_free_consistent(dev, len, txq->cmd, txq->dma_addr_cmd); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[-mm patch] iwl-base.c bugfixes
On Wed, Aug 22, 2007 at 02:06:48AM -0700, Andrew Morton wrote: ... Changes since 2.6.23-rc2-mm2: ... git-wireless.patch ... git trees ... This patch fixes two obvious bugs. Signed-off-by: Adrian Bunk [EMAIL PROTECTED] --- drivers/net/wireless/iwl-base.c |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 600ffdc11b25ac0aee15271d1b2ce99a367efa31 diff --git a/drivers/net/wireless/iwl-base.c b/drivers/net/wireless/iwl-base.c index b8293fe..f65c30e 100644 --- a/drivers/net/wireless/iwl-base.c +++ b/drivers/net/wireless/iwl-base.c @@ -343,7 +343,7 @@ int iwl_tx_queue_init(struct iwl_priv *priv, * command is very huge the system will not have two scan at the * same time */ len = sizeof(struct iwl_cmd) * slots_num; - if (txq_id == IWL_CMD_QUEUE_NUM); + if (txq_id == IWL_CMD_QUEUE_NUM) len += IWL_MAX_SCAN_SIZE; txq-cmd = pci_alloc_consistent(dev, len, txq-dma_addr_cmd); if (!txq-cmd) @@ -390,7 +390,7 @@ void iwl_tx_queue_free(struct iwl_priv *priv, struct iwl_tx_queue *txq) iwl_hw_txq_free_tfd(priv, txq); len = sizeof(struct iwl_cmd) * q-n_window; - if (q-id == IWL_CMD_QUEUE_NUM); + if (q-id == IWL_CMD_QUEUE_NUM) len += IWL_MAX_SCAN_SIZE; pci_free_consistent(dev, len, txq-cmd, txq-dma_addr_cmd); - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [-mm patch] iwl-base.c bugfixes
On 8/28/07, Adrian Bunk [EMAIL PROTECTED] wrote: On Wed, Aug 22, 2007 at 02:06:48AM -0700, Andrew Morton wrote: ... Changes since 2.6.23-rc2-mm2: ... git-wireless.patch ... git trees ... This patch fixes two obvious bugs. Signed-off-by: Adrian Bunk [EMAIL PROTECTED] --- drivers/net/wireless/iwl-base.c |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 600ffdc11b25ac0aee15271d1b2ce99a367efa31 diff --git a/drivers/net/wireless/iwl-base.c b/drivers/net/wireless/iwl-base.c index b8293fe..f65c30e 100644 --- a/drivers/net/wireless/iwl-base.c +++ b/drivers/net/wireless/iwl-base.c @@ -343,7 +343,7 @@ int iwl_tx_queue_init(struct iwl_priv *priv, * command is very huge the system will not have two scan at the * same time */ len = sizeof(struct iwl_cmd) * slots_num; - if (txq_id == IWL_CMD_QUEUE_NUM); + if (txq_id == IWL_CMD_QUEUE_NUM) len += IWL_MAX_SCAN_SIZE; txq-cmd = pci_alloc_consistent(dev, len, txq-dma_addr_cmd); if (!txq-cmd) @@ -390,7 +390,7 @@ void iwl_tx_queue_free(struct iwl_priv *priv, struct iwl_tx_queue *txq) iwl_hw_txq_free_tfd(priv, txq); len = sizeof(struct iwl_cmd) * q-n_window; - if (q-id == IWL_CMD_QUEUE_NUM); + if (q-id == IWL_CMD_QUEUE_NUM) len += IWL_MAX_SCAN_SIZE; pci_free_consistent(dev, len, txq-cmd, txq-dma_addr_cmd); Shame on me. Thanks To unsubscribe from this list: send the line unsubscribe linux-wireless in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
