Updated from Linux LTS 3.10.22 to 3.10.23
This commit is contained in:
@@ -678,9 +678,6 @@ static void cp_tx (struct cp_private *cp)
|
||||
le32_to_cpu(txd->opts1) & 0xffff,
|
||||
PCI_DMA_TODEVICE);
|
||||
|
||||
bytes_compl += skb->len;
|
||||
pkts_compl++;
|
||||
|
||||
if (status & LastFrag) {
|
||||
if (status & (TxError | TxFIFOUnder)) {
|
||||
netif_dbg(cp, tx_err, cp->dev,
|
||||
@@ -702,6 +699,8 @@ static void cp_tx (struct cp_private *cp)
|
||||
netif_dbg(cp, tx_done, cp->dev,
|
||||
"tx done, slot %d\n", tx_tail);
|
||||
}
|
||||
bytes_compl += skb->len;
|
||||
pkts_compl++;
|
||||
dev_kfree_skb_irq(skb);
|
||||
}
|
||||
|
||||
|
||||
@@ -3461,6 +3461,11 @@ static void rtl8168g_1_hw_phy_config(struct rtl8169_private *tp)
|
||||
rtl_writephy(tp, 0x14, 0x9065);
|
||||
rtl_writephy(tp, 0x14, 0x1065);
|
||||
|
||||
/* Check ALDPS bit, disable it if enabled */
|
||||
rtl_writephy(tp, 0x1f, 0x0a43);
|
||||
if (rtl_readphy(tp, 0x10) & 0x0004)
|
||||
rtl_w1w0_phy(tp, 0x10, 0x0000, 0x0004);
|
||||
|
||||
rtl_writephy(tp, 0x1f, 0x0000);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user