View | Details | Raw Unified | Return to bug 32962 | Differences between
and this patch

Collapse All | Expand All

(-)a/drivers/net/r8169.c (-7 / +8 lines)
Lines 717-723 static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb, Link Here
717
				      struct net_device *dev);
717
				      struct net_device *dev);
718
static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance);
718
static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance);
719
static int rtl8169_init_ring(struct net_device *dev);
719
static int rtl8169_init_ring(struct net_device *dev);
720
static void rtl_hw_start(struct net_device *dev);
720
static void rtl_start(struct net_device *dev);
721
static int rtl8169_close(struct net_device *dev);
721
static int rtl8169_close(struct net_device *dev);
722
static void rtl_set_rx_mode(struct net_device *dev);
722
static void rtl_set_rx_mode(struct net_device *dev);
723
static void rtl8169_tx_timeout(struct net_device *dev);
723
static void rtl8169_tx_timeout(struct net_device *dev);
Lines 3581-3588 static void rtl_hw_reset(struct rtl8169_private *tp) Link Here
3581
			break;
3581
			break;
3582
		udelay(100);
3582
		udelay(100);
3583
	}
3583
	}
3584
3585
	rtl8169_init_ring_indexes(tp);
3586
}
3584
}
3587
3585
3588
static int __devinit
3586
static int __devinit
Lines 3941-3947 static int rtl8169_open(struct net_device *dev) Link Here
3941
3939
3942
	rtl_pll_power_up(tp);
3940
	rtl_pll_power_up(tp);
3943
3941
3944
	rtl_hw_start(dev);
3942
	rtl_start(dev);
3945
3943
3946
	tp->saved_wolopts = 0;
3944
	tp->saved_wolopts = 0;
3947
	pm_runtime_put_noidle(&pdev->dev);
3945
	pm_runtime_put_noidle(&pdev->dev);
Lines 4007-4016 static void rtl_set_rx_tx_config_registers(struct rtl8169_private *tp) Link Here
4007
		(InterFrameGap << TxInterFrameGapShift));
4005
		(InterFrameGap << TxInterFrameGapShift));
4008
}
4006
}
4009
4007
4010
static void rtl_hw_start(struct net_device *dev)
4008
static void rtl_start(struct net_device *dev)
4011
{
4009
{
4012
	struct rtl8169_private *tp = netdev_priv(dev);
4010
	struct rtl8169_private *tp = netdev_priv(dev);
4013
4011
4012
	rtl8169_init_ring_indexes(tp);
4013
4014
	smp_mb();
4015
4014
	tp->hw_start(dev);
4016
	tp->hw_start(dev);
4015
4017
4016
	netif_start_queue(dev);
4018
	netif_start_queue(dev);
Lines 4990-4996 static void rtl8169_reset_task(struct work_struct *work) Link Here
4990
	rtl8169_tx_clear(tp);
4992
	rtl8169_tx_clear(tp);
4991
4993
4992
	rtl8169_hw_reset(tp);
4994
	rtl8169_hw_reset(tp);
4993
	rtl_hw_start(dev);
4995
	rtl_start(dev);
4994
	netif_wake_queue(dev);
4996
	netif_wake_queue(dev);
4995
	rtl8169_check_link_status(dev, tp, tp->mmio_addr);
4997
	rtl8169_check_link_status(dev, tp, tp->mmio_addr);
4996
4998
4997
- 

Return to bug 32962