netdev - linux-next: manual merge of the wireless-next tree with the 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: <20111221124931.992e4e4265f2c3cd1d2e75b4@canb.auug.org.au>
Date:	Wed, 21 Dec 2011 12:49:31 +1100
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,
	Rusty Russell <rusty@...tcorp.com.au>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
	Franky Lin <frankyl@...adcom.com>
Subject: linux-next: manual merge of the wireless-next tree with the  tree

Hi John,

Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c between commit
3db1cd5c05f3 ("net: fix assignment of 0/1 to bool variables") from the
tree and commit 3fb1d8d2dad3 ("brcm80211: fmac: move driver up status to
struct brcmf_bus") from the wireless-next tree.

I fixed it up (see below) and can carry the fix as necessary.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index 2c3a99d,72bee2c..0000000
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@@ -805,7 -784,7 +784,7 @@@ static int brcmf_netdev_stop(struct net
  		return 0;
  
  	/* Set state and stop OS transmissions */
- 	drvr->up = false;
 -	drvr->bus_if->drvr_up = 0;
++	drvr->bus_if->drvr_up = false;
  	netif_stop_queue(ndev);
  
  	return 0;
@@@ -842,8 -821,8 +821,8 @@@ static int brcmf_netdev_open(struct net
  	}
  	/* Allow transmit calls */
  	netif_start_queue(ndev);
- 	drvr_priv->pub.up = true;
- 	if (brcmf_cfg80211_up(drvr_priv->pub.config)) {
 -	drvr->bus_if->drvr_up = 1;
++	drvr->bus_if->drvr_up = true;
+ 	if (brcmf_cfg80211_up(drvr->config)) {
  		brcmf_dbg(ERROR, "failed to bring up cfg80211\n");
  		return -1;
  	}

Content of type "application/pgp-signature" skipped