Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1745 commits)
  dp83640: free packet queues on remove
  dp83640: use proper function to free transmit time stamping packets
  ipv6: Do not use routes from locally generated RAs
  |PATCH net-next] tg3: add tx_dropped counter
  be2net: don't create multiple RX/TX rings in multi channel mode
  be2net: don't create multiple TXQs in BE2
  be2net: refactor VF setup/teardown code into be_vf_setup/clear()
  be2net: add vlan/rx-mode/flow-control config to be_setup()
  net_sched: cls_flow: use skb_header_pointer()
  ipv4: avoid useless call of the function check_peer_pmtu
  TCP: remove TCP_DEBUG
  net: Fix driver name for mdio-gpio.c
  ipv4: tcp: fix TOS value in ACK messages sent from TIME_WAIT
  rtnetlink: Add missing manual netlink notification in dev_change_net_namespaces
  ipv4: fix ipsec forward performance regression
  jme: fix irq storm after suspend/resume
  route: fix ICMP redirect validation
  net: hold sock reference while processing tx timestamps
  tcp: md5: add more const attributes
  Add ethtool -g support to virtio_net
  ...

Fix up conflicts in:
 - drivers/net/Kconfig:
	The split-up generated a trivial conflict with removal of a
	stale reference to Documentation/networking/net-modules.txt.
	Remove it from the new location instead.
 - fs/sysfs/dir.c:
	Fairly nasty conflicts with the sysfs rb-tree usage, conflicting
	with Eric Biederman's changes for tagged directories.

1 files changed, 14 insertions, 42 deletions

diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index f8648b7288d5..177a8e669241 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -218,7 +218,6 @@ static void rtl_pci_disable_aspm(struct ieee80211_hw *hw)
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         u8 pcibridge_vendor = pcipriv->ndis_adapter.pcibridge_vendor;
-        u32 pcicfg_addrport = pcipriv->ndis_adapter.pcicfg_addrport;
         u8 num4bytes = pcipriv->ndis_adapter.num4bytes;
         /*Retrieve original configuration settings. */
         u8 linkctrl_reg = pcipriv->ndis_adapter.linkctrl_reg;
@@ -254,9 +253,8 @@ static void rtl_pci_disable_aspm(struct ieee80211_hw *hw)
         udelay(50);
 
         /*4 Disable Pci Bridge ASPM */
-        rtl_pci_raw_write_port_ulong(PCI_CONF_ADDRESS,
-                                     pcicfg_addrport + (num4bytes << 2));
-        rtl_pci_raw_write_port_uchar(PCI_CONF_DATA, pcibridge_linkctrlreg);
+        pci_write_config_byte(rtlpci->pdev, (num4bytes << 2),
+                              pcibridge_linkctrlreg);
 
         udelay(50);
 }
@@ -277,7 +275,6 @@ static void rtl_pci_enable_aspm(struct ieee80211_hw *hw)
         u8 pcibridge_devnum = pcipriv->ndis_adapter.pcibridge_devnum;
         u8 pcibridge_funcnum = pcipriv->ndis_adapter.pcibridge_funcnum;
         u8 pcibridge_vendor = pcipriv->ndis_adapter.pcibridge_vendor;
-        u32 pcicfg_addrport = pcipriv->ndis_adapter.pcicfg_addrport;
         u8 num4bytes = pcipriv->ndis_adapter.num4bytes;
         u16 aspmlevel;
         u8 u_pcibridge_aspmsetting;
@@ -293,8 +290,6 @@ static void rtl_pci_enable_aspm(struct ieee80211_hw *hw)
         }
 
         /*4 Enable Pci Bridge ASPM */
-        rtl_pci_raw_write_port_ulong(PCI_CONF_ADDRESS,
-                                     pcicfg_addrport + (num4bytes << 2));
 
         u_pcibridge_aspmsetting =
             pcipriv->ndis_adapter.pcibridge_linkctrlreg |
@@ -303,7 +298,8 @@ static void rtl_pci_enable_aspm(struct ieee80211_hw *hw)
         if (pcibridge_vendor == PCI_BRIDGE_VENDOR_INTEL)
                 u_pcibridge_aspmsetting &= ~BIT(0);
 
-        rtl_pci_raw_write_port_uchar(PCI_CONF_DATA, u_pcibridge_aspmsetting);
+        pci_write_config_byte(rtlpci->pdev, (num4bytes << 2),
+                              u_pcibridge_aspmsetting);
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
                  ("PlatformEnableASPM():PciBridge busnumber[%x], "
@@ -335,25 +331,18 @@ static void rtl_pci_enable_aspm(struct ieee80211_hw *hw)
 
 static bool rtl_pci_get_amd_l1_patch(struct ieee80211_hw *hw)
 {
-        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
-        u32 pcicfg_addrport = pcipriv->ndis_adapter.pcicfg_addrport;
+        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
 
         bool status = false;
         u8 offset_e0;
         unsigned offset_e4;
 
-        rtl_pci_raw_write_port_ulong(PCI_CONF_ADDRESS,
-                        pcicfg_addrport + 0xE0);
-        rtl_pci_raw_write_port_uchar(PCI_CONF_DATA, 0xA0);
+        pci_write_config_byte(rtlpci->pdev, 0xe0, 0xa0);
 
-        rtl_pci_raw_write_port_ulong(PCI_CONF_ADDRESS,
-                        pcicfg_addrport + 0xE0);
-        rtl_pci_raw_read_port_uchar(PCI_CONF_DATA, &offset_e0);
+        pci_read_config_byte(rtlpci->pdev, 0xe0, &offset_e0);
 
         if (offset_e0 == 0xA0) {
-                rtl_pci_raw_write_port_ulong(PCI_CONF_ADDRESS,
-                                             pcicfg_addrport + 0xE4);
-                rtl_pci_raw_read_port_ulong(PCI_CONF_DATA, &offset_e4);
+                pci_read_config_dword(rtlpci->pdev, 0xe4, &offset_e4);
                 if (offset_e4 & BIT(23))
                         status = true;
         }
@@ -364,17 +353,15 @@ static bool rtl_pci_get_amd_l1_patch(struct ieee80211_hw *hw)
 static void rtl_pci_get_linkcontrol_field(struct ieee80211_hw *hw)
 {
         struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(pcipriv);
         u8 capabilityoffset = pcipriv->ndis_adapter.pcibridge_pciehdr_offset;
-        u32 pcicfg_addrport = pcipriv->ndis_adapter.pcicfg_addrport;
         u8 linkctrl_reg;
         u8 num4bbytes;
 
         num4bbytes = (capabilityoffset + 0x10) / 4;
 
         /*Read  Link Control Register */
-        rtl_pci_raw_write_port_ulong(PCI_CONF_ADDRESS,
-                                     pcicfg_addrport + (num4bbytes << 2));
-        rtl_pci_raw_read_port_uchar(PCI_CONF_DATA, &linkctrl_reg);
+        pci_read_config_byte(rtlpci->pdev, (num4bbytes << 2), &linkctrl_reg);
 
         pcipriv->ndis_adapter.pcibridge_linkctrlreg = linkctrl_reg;
 }
@@ -1718,10 +1705,6 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev,
                     PCI_SLOT(bridge_pdev->devfn);
                 pcipriv->ndis_adapter.pcibridge_funcnum =
                     PCI_FUNC(bridge_pdev->devfn);
-                pcipriv->ndis_adapter.pcicfg_addrport =
-                    (pcipriv->ndis_adapter.pcibridge_busnum << 16) |
-                    (pcipriv->ndis_adapter.pcibridge_devnum << 11) |
-                    (pcipriv->ndis_adapter.pcibridge_funcnum << 8) | (1 << 31);
                 pcipriv->ndis_adapter.pcibridge_pciehdr_offset =
                     pci_pcie_cap(bridge_pdev);
                 pcipriv->ndis_adapter.num4bytes =
@@ -2010,36 +1993,25 @@ call rtl_mac_stop() from the mac80211
 suspend function first, So there is
 no need to call hw_disable here.
 ****************************************/
-int rtl_pci_suspend(struct pci_dev *pdev, pm_message_t state)
+int rtl_pci_suspend(struct device *dev)
 {
+        struct pci_dev *pdev = to_pci_dev(dev);
         struct ieee80211_hw *hw = pci_get_drvdata(pdev);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         rtlpriv->cfg->ops->hw_suspend(hw);
         rtl_deinit_rfkill(hw);
 
-        pci_save_state(pdev);
-        pci_disable_device(pdev);
-        pci_set_power_state(pdev, PCI_D3hot);
         return 0;
 }
 EXPORT_SYMBOL(rtl_pci_suspend);
 
-int rtl_pci_resume(struct pci_dev *pdev)
+int rtl_pci_resume(struct device *dev)
 {
-        int ret;
+        struct pci_dev *pdev = to_pci_dev(dev);
         struct ieee80211_hw *hw = pci_get_drvdata(pdev);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        pci_set_power_state(pdev, PCI_D0);
-        ret = pci_enable_device(pdev);
-        if (ret) {
-                RT_ASSERT(false, ("ERR: <======\n"));
-                return ret;
-        }
-
-        pci_restore_state(pdev);
-
         rtlpriv->cfg->ops->hw_resume(hw);
         rtl_init_rfkill(hw);
         return 0;