linux-next: manual merge of the wireless-next tree with the tree

linux-next: manual merge of the wireless-next tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1372 bytes --]

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@canb.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;
  	}

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the wireless-next tree with the tree

[Arend van Spriel]

On 12/21/2011 02:49 AM, Stephen Rothwell wrote:
> 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.
> 

Thanks, Stephen

I noticed Rusty's patch and the use of 0/1 for bool in our tree. Was
going to fix that, but this fix looks fine.

Gr. AvS