--- drivers/net/r8169.c
+++ drivers/net/r8169.c
@@ -23,7 +23,6 @@
#include <linux/tcp.h>
#include <linux/init.h>
#include <linux/dma-mapping.h>
-#include <linux/pci-aspm.h>
#include <asm/system.h>
#include <asm/io.h>
@@ -558,11 +557,6 @@ static void mdio_write(void __iomem *ioa
break;
udelay(25);
}
- /*
- * According to hardware specs a 20us delay is required after write
- * complete indication, but before sending next command.
- */
- udelay(20);
}
static int mdio_read(void __iomem *ioaddr, int reg_addr)
@@ -582,12 +576,6 @@ static int mdio_read(void __iomem *ioadd
}
udelay(25);
}
- /*
- * According to hardware specs a 20us delay is required after read
- * complete indication, but before sending next command.
- */
- udelay(20);
-
return value;
}
@@ -3031,11 +3019,6 @@ rtl8169_init_one(struct pci_dev *pdev, c
mii->reg_num_mask = 0x1f;
mii->supports_gmii = !!(cfg->features & RTL_FEATURE_GMII);
- /* disable ASPM completely as that cause random device stop working
- * problems as well as full system hangs for some PCIe devices users */
- pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |
- PCIE_LINK_STATE_CLKPM);
-
/* enable device (incl. PCI PM wakeup and hotplug setup) */
rc = pci_enable_device(pdev);
if (rc < 0) {
@@ -4005,7 +3988,7 @@ static inline void rtl8169_map_to_asic(s
static struct sk_buff *rtl8169_alloc_rx_skb(struct pci_dev *pdev,
struct net_device *dev,
struct RxDesc *desc, int rx_buf_sz,
- unsigned int align, gfp_t gfp)
+ unsigned int align)
{
struct sk_buff *skb;
dma_addr_t mapping;
@@ -4013,7 +3996,7 @@ static struct sk_buff *rtl8169_alloc_rx_
pad = align ? align : NET_IP_ALIGN;
- skb = __netdev_alloc_skb(dev, rx_buf_sz + pad, gfp);
+ skb = netdev_alloc_skb(dev, rx_buf_sz + pad);
if (!skb)
goto err_out;
@@ -4044,7 +4027,7 @@ static void rtl8169_rx_clear(struct rtl8
}
static u32 rtl8169_rx_fill(struct rtl8169_private *tp, struct net_device *dev,
- u32 start, u32 end, gfp_t gfp)
+ u32 start, u32 end)
{
u32 cur;
@@ -4059,7 +4042,7 @@ static u32 rtl8169_rx_fill(struct rtl816
skb = rtl8169_alloc_rx_skb(tp->pci_dev, dev,
tp->RxDescArray + i,
- tp->rx_buf_sz, tp->align, gfp);
+ tp->rx_buf_sz, tp->align);
if (!skb)
break;
@@ -4087,7 +4070,7 @@ static int rtl8169_init_ring(struct net_
memset(tp->tx_skb, 0x0, NUM_TX_DESC * sizeof(struct ring_info));
memset(tp->Rx_skbuff, 0x0, NUM_RX_DESC * sizeof(struct sk_buff *));
- if (rtl8169_rx_fill(tp, dev, 0, NUM_RX_DESC, GFP_KERNEL) != NUM_RX_DESC)
+ if (rtl8169_rx_fill(tp, dev, 0, NUM_RX_DESC) != NUM_RX_DESC)
goto err_out;
rtl8169_mark_as_last_descriptor(tp->RxDescArray + NUM_RX_DESC - 1);
@@ -4590,7 +4573,7 @@ static int rtl8169_rx_interrupt(struct n
count = cur_rx - tp->cur_rx;
tp->cur_rx = cur_rx;
- delta = rtl8169_rx_fill(tp, dev, tp->dirty_rx, tp->cur_rx, GFP_ATOMIC);
+ delta = rtl8169_rx_fill(tp, dev, tp->dirty_rx, tp->cur_rx);
if (!delta && count && netif_msg_intr(tp))
printk(KERN_INFO "%s: no Rx buffer allocated\n", dev->name);
tp->dirty_rx += delta;
projects / ziggy471-frankenstein-kernel.git / blobdiff