linux-kernel - linux-next: manual merge of the wireless tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20110915131453.7ce8c4e9d6d1bcd7f8ade995@canb.auug.org.au>
Date:	Thu, 15 Sep 2011 13:14:53 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"John W. Linville" <linville@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Stanislaw Gruszka <sgruszka@...hat.com>,
	Helmut Schaa <helmut.schaa@...glemail.com>
Subject: linux-next: manual merge of the wireless tree with Linus' tree

Hi John,

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.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.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));
  	}
  }
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/