linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Helmut Schaa <helmut.schaa@googlemail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "John W. Linville" <linville@tuxdriver.com>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Stanislaw Gruszka <sgruszka@redhat.com>
Subject: Re: linux-next: manual merge of the wireless tree with Linus' tree
Date: Thu, 15 Sep 2011 09:17:07 +0200	[thread overview]
Message-ID: <CAGXE3d_eBtgwdxcvzVTmxCJvNbNoTQ5YM9jRi7-6+8NW=hRVog@mail.gmail.com> (raw)
In-Reply-To: <20110915131453.7ce8c4e9d6d1bcd7f8ade995@canb.auug.org.au>

On Thu, Sep 15, 2011 at 5:14 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/net/wireless/rt2x00/rt2800usb.c between commit 674db1344443
> ("rt2x00: fix crash in rt2800usb_get_txwi") from Linus' tree and commit
> 31937c423ed3 ("rt2x00: Minor optimizazion in txdone path") from the
> wireless tree.
>
> I fixed it up (see below) anc can carry the fix as necessary.

Fix looks good to me.

Thanks,
Helmut

> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
>
> diff --cc drivers/net/wireless/rt2x00/rt2800usb.c
> index dbf501c,4b907a5..0000000
> --- a/drivers/net/wireless/rt2x00/rt2800usb.c
> +++ b/drivers/net/wireless/rt2x00/rt2800usb.c
> @@@ -538,11 -529,13 +538,12 @@@ static void rt2800usb_txdone(struct rt2
>                        entry = rt2x00queue_get_entry(queue, Q_INDEX_DONE);
>                        if (rt2800usb_txdone_entry_check(entry, reg))
>                                break;
>  +                      entry = NULL;
>                }
>
>  -              if (!entry || rt2x00queue_empty(queue))
>  -                      break;
>  -
>  -              rt2800_txdone_entry(entry, reg,
>  +              if (entry)
> -                       rt2800_txdone_entry(entry, reg);
> ++                      rt2800_txdone_entry(entry, reg,
> +                                   rt2800usb_get_txwi(entry));
>        }
>  }
>
>

  reply	other threads:[~2011-09-15  7:17 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-15  3:14 linux-next: manual merge of the wireless tree with Linus' tree Stephen Rothwell
2011-09-15  7:17 ` Helmut Schaa [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-02-14  0:19 Stephen Rothwell
2012-01-04  1:40 Stephen Rothwell
2011-09-20  3:28 Stephen Rothwell
2011-09-20 12:55 ` John W. Linville
2011-09-20  3:22 Stephen Rothwell
2011-09-19  5:14 Stephen Rothwell
2011-09-19  5:28 ` Luciano Coelho
2011-09-15  3:14 Stephen Rothwell
2011-08-30  3:46 Stephen Rothwell
2011-05-12  1:42 Stephen Rothwell
2011-05-11  1:52 Stephen Rothwell
2011-04-27  1:00 Stephen Rothwell
2011-04-13  2:30 Stephen Rothwell
2011-04-08  4:10 Stephen Rothwell
2011-04-08  5:11 ` Jussi Kivilinna
2011-04-08  4:10 Stephen Rothwell
2010-09-21  2:20 Stephen Rothwell
2010-09-21  2:09 Stephen Rothwell
2010-09-21  6:53 ` Ohad Ben-Cohen
2010-09-21  8:57   ` Ohad Ben-Cohen
2010-09-21 15:08 ` John W. Linville
2010-08-17  1:52 Stephen Rothwell
2010-08-17  2:59 ` Rusty Russell
2010-08-17  3:07   ` Stephen Rothwell
2010-06-15  2:00 Stephen Rothwell
2010-06-15 14:42 ` John W. Linville
2010-05-10  1:27 Stephen Rothwell
2010-04-27  1:28 Stephen Rothwell
2010-01-06  2:29 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAGXE3d_eBtgwdxcvzVTmxCJvNbNoTQ5YM9jRi7-6+8NW=hRVog@mail.gmail.com' \
    --to=helmut.schaa@googlemail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=sfr@canb.auug.org.au \
    --cc=sgruszka@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).