From: "John W. Linville" <linville@tuxdriver.com>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, jgarzik@pobox.com, sfr@canb.auug.org.au
Subject: Re: net-2.6 merged into net-next-2.6
Date: Tue, 10 Jun 2008 12:02:12 -0400 [thread overview]
Message-ID: <20080610160212.GA16834@tuxdriver.com> (raw)
In-Reply-To: <20080610.025059.37807108.davem@davemloft.net>
On Tue, Jun 10, 2008 at 02:50:59AM -0700, David Miller wrote:
>
> There were a few small wireless conflicts but I think
> I handled them correctly.
>
> Please send me any fixup patches which might be necessary.
Just one, which was easy to miss:
The following changes since commit 65b53e4cc90e59936733b3b95b9451d2ca47528d:
David S. Miller (1):
Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git
master
John W. Linville (1):
rt2x00dev.c: fix-up merge damage
drivers/net/wireless/rt2x00/rt2x00dev.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index f7a4417..dc5ab90 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -507,7 +507,7 @@ void rt2x00lib_txdone(struct queue_entry *entry,
rt2x00dev->link.qual.tx_success +=
test_bit(TXDONE_SUCCESS, &txdesc->flags);
rt2x00dev->link.qual.tx_failed +=
- txdesc->retry + !!test_bit(TXDONE_FAILURE, &txdesc->flags);
+ test_bit(TXDONE_FAILURE, &txdesc->flags);
/*
* Initialize TX status
--
John W. Linville
linville@tuxdriver.com
next prev parent reply other threads:[~2008-06-10 16:29 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-10 9:50 net-2.6 merged into net-next-2.6 David Miller
2008-06-10 16:02 ` John W. Linville [this message]
2008-06-10 17:47 ` John W. Linville
2008-06-10 19:24 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2011-07-06 6:38 David Miller
2010-12-17 21:03 David Miller
2010-09-27 8:14 David Miller
2009-07-17 4:04 David Miller
2008-07-06 6:21 David Miller
2008-06-19 23:06 David Miller
2008-06-19 23:18 ` Stephen Rothwell
2008-06-17 2:31 David Miller
2008-05-26 6:39 David Miller
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=20080610160212.GA16834@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=davem@davemloft.net \
--cc=jgarzik@pobox.com \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).