On Mon, Feb 14, 2011 at 03:55:25PM +0100, Johannes Berg wrote:
> On Mon, 2011-02-14 at 15:53 +0100, Johannes Berg wrote:
> > On Mon, 2011-02-14 at 15:33 +0100, Stanislaw Gruszka wrote:
> > > We allocate txq->txb area with kzalloc, but when reseting queue
> > > during __iwl_down / __iwl_up we we leave old values, let's zero
> > > initialize in such case as well.
> > >
> > > Signed-off-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
> > > ---
> > > drivers/net/wireless/iwlwifi/iwl-tx.c | 2 ++
> > > 1 files changed, 2 insertions(+), 0 deletions(-)
> > >
> > > diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
> > > index a8935cd..0c8555c 100644
> > > --- a/drivers/net/wireless/iwlwifi/iwl-tx.c
> > > +++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
> > > @@ -418,6 +418,8 @@ void iwl_tx_queue_reset(struct iwl_priv *priv, struct iwl_tx_queue *txq,
> > >
> > > if (txq_id == priv->cmd_queue)
> > > actual_slots++;
> > > + else
> > > + memset(txq->txb, 0, sizeof(txq->txb[0]) * TFD_QUEUE_SIZE_MAX);
> >
> > I don't mind -- but I think the changelog should say that this isn't
> > necessary since the device will never use any of those entries?
>
> Err, I confused txb and tfds. But it still shouldn't be necessary --
> aren't the entries reset to NULL when taken out of use?
There are memset zero before the use in {iwlagn,iwl3945}_tx_skb(),
so patch is unneeded as well kzalloc in current code (I add replace
to kmalloc to my todo list).
Stanislaw
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
