diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-10-25 16:13:34 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-10-25 16:13:34 +0000 |
| commit | 6bc864016313e486d8d451a7d1421f11d48cf6a6 (patch) | |
| tree | c23bb1e4ea311e383efeff4c84f95ef87d38b678 /target/linux/generic/patches-4.3/761-8139cp-fixes-from-4.4.patch | |
| parent | e67b786afef964655570d728ab44ad35548fa96d (diff) | |
| download | upstream-6bc864016313e486d8d451a7d1421f11d48cf6a6.tar.gz upstream-6bc864016313e486d8d451a7d1421f11d48cf6a6.tar.bz2 upstream-6bc864016313e486d8d451a7d1421f11d48cf6a6.zip | |
kernel: update kernel 4.3 to version 4.3-rc7
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 47250
Diffstat (limited to 'target/linux/generic/patches-4.3/761-8139cp-fixes-from-4.4.patch')
| -rw-r--r-- | target/linux/generic/patches-4.3/761-8139cp-fixes-from-4.4.patch | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/target/linux/generic/patches-4.3/761-8139cp-fixes-from-4.4.patch b/target/linux/generic/patches-4.3/761-8139cp-fixes-from-4.4.patch index cb605e531c..8fdf5f382f 100644 --- a/target/linux/generic/patches-4.3/761-8139cp-fixes-from-4.4.patch +++ b/target/linux/generic/patches-4.3/761-8139cp-fixes-from-4.4.patch @@ -33,8 +33,6 @@ Date: Wed Sep 23 09:46:09 2015 +0100 Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net> -diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c -index 686334f..deae10d 100644 --- a/drivers/net/ethernet/realtek/8139cp.c +++ b/drivers/net/ethernet/realtek/8139cp.c @@ -175,7 +175,7 @@ enum { @@ -46,7 +44,7 @@ index 686334f..deae10d 100644 TxError = (1 << 23), /* Tx error summary */ RxError = (1 << 20), /* Rx error summary */ IPCS = (1 << 18), /* Calculate IP checksum */ -@@ -754,10 +754,16 @@ static netdev_tx_t cp_start_xmit (struct sk_buff *skb, +@@ -754,10 +754,16 @@ static netdev_tx_t cp_start_xmit (struct eor = (entry == (CP_TX_RING_SIZE - 1)) ? RingEnd : 0; mss = skb_shinfo(skb)->gso_size; @@ -64,7 +62,7 @@ index 686334f..deae10d 100644 else if (skb->ip_summed == CHECKSUM_PARTIAL) { const struct iphdr *ip = ip_hdr(skb); if (ip->protocol == IPPROTO_TCP) -@@ -1852,6 +1858,15 @@ static void cp_set_d3_state (struct cp_private *cp) +@@ -1852,6 +1858,15 @@ static void cp_set_d3_state (struct cp_p pci_set_power_state (cp->pdev, PCI_D3hot); } @@ -80,7 +78,7 @@ index 686334f..deae10d 100644 static const struct net_device_ops cp_netdev_ops = { .ndo_open = cp_open, .ndo_stop = cp_close, -@@ -1864,6 +1879,7 @@ static const struct net_device_ops cp_netdev_ops = { +@@ -1864,6 +1879,7 @@ static const struct net_device_ops cp_ne .ndo_tx_timeout = cp_tx_timeout, .ndo_set_features = cp_set_features, .ndo_change_mtu = cp_change_mtu, @@ -88,7 +86,7 @@ index 686334f..deae10d 100644 #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = cp_poll_controller, -@@ -1983,12 +1999,12 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) +@@ -1983,12 +1999,12 @@ static int cp_init_one (struct pci_dev * dev->ethtool_ops = &cp_ethtool_ops; dev->watchdog_timeo = TX_TIMEOUT; |