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>] [day] [month] [year] [list]

Message-Id: <20110830134617.cd571743e6ef68bd4afac999@canb.auug.org.au>
Date:	Tue, 30 Aug 2011 13:46:17 +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,
	Emmanuel Grumbach <emmanuel.grumbach@...el.com>,
	"Wey-Yi Guy" <wey-yi.w.guy@...el.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/iwlwifi/iwl-pci.c between commit 16a9d06c753a
("iwlagn: sysfs couldn't find the priv pointer") from Linus' tree and
commit cac988a682d4 ("iwlagn: introduce struct iwl-shared - known by all
layers") from the wireless tree.

I fixed it up (I think - see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/net/wireless/iwlwifi/iwl-pci.c
index 2fdbffa,e41f53e..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-pci.c
+++ b/drivers/net/wireless/iwlwifi/iwl-pci.c
@@@ -478,25 -483,30 +483,25 @@@ out_no_pci
  	return err;
  }
  
 -static void iwl_pci_down(struct iwl_bus *bus)
 -{
 -	struct iwl_pci_bus *pci_bus = (struct iwl_pci_bus *) bus->bus_specific;
 -
 -	pci_disable_msi(pci_bus->pci_dev);
 -	pci_iounmap(pci_bus->pci_dev, pci_bus->hw_base);
 -	pci_release_regions(pci_bus->pci_dev);
 -	pci_disable_device(pci_bus->pci_dev);
 -	pci_set_drvdata(pci_bus->pci_dev, NULL);
 -
 -	kfree(bus);
 -}
 -
  static void __devexit iwl_pci_remove(struct pci_dev *pdev)
  {
- 	struct iwl_priv *priv = pci_get_drvdata(pdev);
- 	struct iwl_bus *bus = priv->bus;
+ 	struct iwl_shared *shrd = pci_get_drvdata(pdev);
+ 	struct iwl_bus *bus = shrd->bus;
 +	struct iwl_pci_bus *pci_bus = IWL_BUS_GET_PCI_BUS(bus);
 +	struct pci_dev *pci_dev = IWL_BUS_GET_PCI_DEV(bus);
  
- 	iwl_remove(priv);
+ 	iwl_remove(shrd->priv);
  
 -	iwl_pci_down(bus);
 +	pci_disable_msi(pci_dev);
 +	pci_iounmap(pci_dev, pci_bus->hw_base);
 +	pci_release_regions(pci_dev);
 +	pci_disable_device(pci_dev);
 +	pci_set_drvdata(pci_dev, NULL);
 +
 +	kfree(bus);
  }
  
- #ifdef CONFIG_PM
+ #ifdef CONFIG_PM_SLEEP
  
  static int iwl_pci_suspend(struct device *device)
  {
--
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/