From: Greg Kroah-Hartman Date: Wed, 23 Jan 2019 07:40:06 +0000 (+0100) Subject: 3.18-stable patches X-Git-Tag: v4.20.5~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6882613d8306560d38c0937c4bb855d753c628e8;p=thirdparty%2Fkernel%2Fstable-queue.git 3.18-stable patches added patches: r8169-add-support-for-new-realtek-ethernet.patch --- diff --git a/queue-3.18/r8169-add-support-for-new-realtek-ethernet.patch b/queue-3.18/r8169-add-support-for-new-realtek-ethernet.patch new file mode 100644 index 00000000000..f5f3425dfdc --- /dev/null +++ b/queue-3.18/r8169-add-support-for-new-realtek-ethernet.patch @@ -0,0 +1,31 @@ +From foo@baz Wed Jan 23 08:29:58 CET 2019 +From: Kai-Heng Feng +Date: Wed, 2 Jan 2019 14:45:07 +0800 +Subject: r8169: Add support for new Realtek Ethernet + +From: Kai-Heng Feng + +[ Upstream commit 36352991835ce99e46b4441dd0eb6980f9a83e8f ] + +There are two new Realtek Ethernet devices which are re-branded r8168h. +Add the IDs to to support them. + +Signed-off-by: Kai-Heng Feng +Reviewed-by: Heiner Kallweit +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/realtek/r8169.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/net/ethernet/realtek/r8169.c ++++ b/drivers/net/ethernet/realtek/r8169.c +@@ -324,6 +324,8 @@ enum cfg_version { + }; + + static const struct pci_device_id rtl8169_pci_tbl[] = { ++ { PCI_VDEVICE(REALTEK, 0x2502), RTL_CFG_1 }, ++ { PCI_VDEVICE(REALTEK, 0x2600), RTL_CFG_1 }, + { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8129), 0, 0, RTL_CFG_0 }, + { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8136), 0, 0, RTL_CFG_2 }, + { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8161), 0, 0, RTL_CFG_1 }, diff --git a/queue-3.18/series b/queue-3.18/series index 7688b6a7d8a..06bfd53ae7f 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -31,3 +31,4 @@ sctp-allocate-sctp_sockaddr_entry-with-kzalloc.patch block-loop-use-global-lock-for-ioctl-operation.patch drm-fb-helper-ignore-the-value-of-fb_var_screeninfo.pixclock.patch media-vb2-be-sure-to-unlock-mutex-on-errors.patch +r8169-add-support-for-new-realtek-ethernet.patch diff --git a/queue-4.14/series b/queue-4.14/series new file mode 100644 index 00000000000..9bfc612bb40 --- /dev/null +++ b/queue-4.14/series @@ -0,0 +1,8 @@ +ipv6-consider-sk_bound_dev_if-when-binding-a-socket-to-a-v4-mapped-address.patch +mlxsw-spectrum-disable-lag-port-tx-before-removing-it.patch +mlxsw-spectrum_switchdev-set-pvid-correctly-during-vlan-deletion.patch +net-skbuff-do-not-prefer-skb-allocation-fails-early.patch +qmi_wwan-add-mtu-default-to-qmap-network-interface.patch +r8169-add-support-for-new-realtek-ethernet.patch +ipv6-take-rcu_read_lock-in-__inet6_bind-for-mapped-addresses.patch +net-dsa-mv88x6xxx-mv88e6390-errata.patch diff --git a/queue-4.19/series b/queue-4.19/series new file mode 100644 index 00000000000..aa44dba8f1e --- /dev/null +++ b/queue-4.19/series @@ -0,0 +1,9 @@ +ipv6-consider-sk_bound_dev_if-when-binding-a-socket-to-a-v4-mapped-address.patch +mlxsw-spectrum-disable-lag-port-tx-before-removing-it.patch +mlxsw-spectrum_switchdev-set-pvid-correctly-during-vlan-deletion.patch +net-dsa-mv88x6xxx-mv88e6390-errata.patch +net-skbuff-do-not-prefer-skb-allocation-fails-early.patch +qmi_wwan-add-mtu-default-to-qmap-network-interface.patch +r8169-add-support-for-new-realtek-ethernet.patch +ipv6-take-rcu_read_lock-in-__inet6_bind-for-mapped-addresses.patch +net-clear-skb-tstamp-in-bridge-forwarding-path.patch diff --git a/queue-4.20/series b/queue-4.20/series new file mode 100644 index 00000000000..95ea09cabe2 --- /dev/null +++ b/queue-4.20/series @@ -0,0 +1,13 @@ +ipv6-consider-sk_bound_dev_if-when-binding-a-socket-to-a-v4-mapped-address.patch +mlxsw-spectrum-disable-lag-port-tx-before-removing-it.patch +mlxsw-spectrum_switchdev-set-pvid-correctly-during-vlan-deletion.patch +net-dsa-mv88x6xxx-mv88e6390-errata.patch +net-skbuff-do-not-prefer-skb-allocation-fails-early.patch +qmi_wwan-add-mtu-default-to-qmap-network-interface.patch +r8169-add-support-for-new-realtek-ethernet.patch +ipv6-take-rcu_read_lock-in-__inet6_bind-for-mapped-addresses.patch +ipv6-fix-dump-of-specific-table-with-strict-checking.patch +netlink-fixup-regression-in-rtm_getaddr.patch +octeontx2-af-fix-a-resource-leak-in-an-error-handling-path-in-cgx_probe.patch +openvswitch-fix-ipv6-later-frags-parsing.patch +net-clear-skb-tstamp-in-bridge-forwarding-path.patch diff --git a/queue-4.4/series b/queue-4.4/series index 8d30cb7fe08..f4974707541 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -70,3 +70,6 @@ loop-get-rid-of-loop_index_mutex.patch loop-fix-double-mutex_unlock-loop_ctl_mutex-in-loop_control_ioctl.patch drm-fb-helper-ignore-the-value-of-fb_var_screeninfo.pixclock.patch media-vb2-be-sure-to-unlock-mutex-on-errors.patch +r8169-add-support-for-new-realtek-ethernet.patch +ipv6-consider-sk_bound_dev_if-when-binding-a-socket-to-a-v4-mapped-address.patch +ipv6-take-rcu_read_lock-in-__inet6_bind-for-mapped-addresses.patch diff --git a/queue-4.9/series b/queue-4.9/series new file mode 100644 index 00000000000..a8220498b40 --- /dev/null +++ b/queue-4.9/series @@ -0,0 +1,3 @@ +r8169-add-support-for-new-realtek-ethernet.patch +ipv6-consider-sk_bound_dev_if-when-binding-a-socket-to-a-v4-mapped-address.patch +ipv6-take-rcu_read_lock-in-__inet6_bind-for-mapped-addresses.patch