From d41ab0df41134611cad4302c938432c756d8038c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 7 Jan 2011 13:35:43 -0800 Subject: [PATCH] fix upstream git commit ids --- .../bridge-fix-ipv6-queries-for-bridge-multicast-snooping.patch | 2 +- queue-2.6.36/l2tp-fix-modalias-of-l2tp_ip.patch | 2 +- ...ix-header-size-check-for-gso-case-in-recvmsg-af_packet.patch | 2 +- .../x25-decrement-netdev-reference-counts-on-unload.patch | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/queue-2.6.36/bridge-fix-ipv6-queries-for-bridge-multicast-snooping.patch b/queue-2.6.36/bridge-fix-ipv6-queries-for-bridge-multicast-snooping.patch index 754685c1e72..7363f20af1c 100644 --- a/queue-2.6.36/bridge-fix-ipv6-queries-for-bridge-multicast-snooping.patch +++ b/queue-2.6.36/bridge-fix-ipv6-queries-for-bridge-multicast-snooping.patch @@ -6,7 +6,7 @@ Subject: bridge: fix IPv6 queries for bridge multicast snooping From: David Stevens -[ Upstream commit 04bdf0c9a451863e50fff627713a900a2cabb998 ] +[ Upstream commit 76d661586c8131453ba75a2e027c1f21511a893a] This patch fixes a missing ntohs() for bridge IPv6 multicast snooping. diff --git a/queue-2.6.36/l2tp-fix-modalias-of-l2tp_ip.patch b/queue-2.6.36/l2tp-fix-modalias-of-l2tp_ip.patch index 3b17ac2b67e..ac4b6d31c02 100644 --- a/queue-2.6.36/l2tp-fix-modalias-of-l2tp_ip.patch +++ b/queue-2.6.36/l2tp-fix-modalias-of-l2tp_ip.patch @@ -6,7 +6,7 @@ Subject: l2tp: Fix modalias of l2tp_ip From: Michal Marek -[ Upstream commit 3e5653f0bc5150a2cc67b707130344ce05fb440e ] +[ Upstream commit e8d34a884e4ff118920bb57664def8a73b1b784f] Using the SOCK_DGRAM enum results in "net-pf-2-proto-SOCK_DGRAM-type-115", so use the numeric value like it diff --git a/queue-2.6.36/net-fix-header-size-check-for-gso-case-in-recvmsg-af_packet.patch b/queue-2.6.36/net-fix-header-size-check-for-gso-case-in-recvmsg-af_packet.patch index b31a6ea70e6..81384e4282d 100644 --- a/queue-2.6.36/net-fix-header-size-check-for-gso-case-in-recvmsg-af_packet.patch +++ b/queue-2.6.36/net-fix-header-size-check-for-gso-case-in-recvmsg-af_packet.patch @@ -6,7 +6,7 @@ Subject: net: Fix header size check for GSO case in recvmsg (af_packet) From: Mariusz Kozlowski -[ Upstream commit 54dd76848bf67b9fa40ac0340e5ee9c2876d5393 ] +[ Upstream commit 1f18b7176e2e41fada24584ce3c80e9abfaca52b] Parameter 'len' is size_t type so it will never get negative. diff --git a/queue-2.6.36/x25-decrement-netdev-reference-counts-on-unload.patch b/queue-2.6.36/x25-decrement-netdev-reference-counts-on-unload.patch index 98b787dbb84..c5eb81ab583 100644 --- a/queue-2.6.36/x25-decrement-netdev-reference-counts-on-unload.patch +++ b/queue-2.6.36/x25-decrement-netdev-reference-counts-on-unload.patch @@ -6,7 +6,7 @@ Subject: x25: decrement netdev reference counts on unload From: Apollon Oikonomopoulos -[ Upstream commit 33ce2b3d81dca76f589641b7a675c28f0f6375b1 ] +[ Upstream commit 171995e5d82dcc92bea37a7d2a2ecc21068a0f19] x25 does not decrement the network device reference counts on module unload. Thus unregistering any pre-existing interface after unloading the x25 module -- 2.47.3