From df0fd13942fcef02f63036eecbfa358efaf9aed2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 23 Dec 2005 10:56:26 -0800 Subject: [PATCH] patch refresh --- ...-add-support-for-fadt-p_lvl2_up-flag.patch | 4 ++-- ...x-null-deref-in-video-lcd-brightness.patch | 9 +++------ ...t-over-fadt-for-c-state-capabilities.patch | 8 ++++---- .../dpt_i2o-fix-for-deadlock-condition.patch | 9 +++------ queue/fix-bridge-nf-ipv6-length-check.patch | 9 +++------ ...roto_num-attribute-size-in-ctnetlink.patch | 17 ++++++++--------- ...dependency-for-IP6_NF_TARGET_NFQUEUE.patch | 9 +++------ queue/fix-nat-init-order.patch | 9 +++------ ...balanced-read_unlock_bh-in-ctnetlink.patch | 12 ++++-------- queue/fix-vlan-checksumming.patch | 9 +++------ ...e-fix-hardware-checksum-modification.patch | 9 +++------ queue/input-fix-an-OOPS-in-HID-driver.patch | 9 +++------ ...ec-perform-SA-switchover-immediately.patch | 19 ++++++------------- queue/ipv6-fix-route-lifetime.patch | 13 ++++--------- ...x-RTNLGRP-definitions-in-rtnetlink.h.patch | 9 +++------ 15 files changed, 55 insertions(+), 99 deletions(-) diff --git a/queue/acpi-add-support-for-fadt-p_lvl2_up-flag.patch b/queue/acpi-add-support-for-fadt-p_lvl2_up-flag.patch index 18f85149c5b..e8141602293 100644 --- a/queue/acpi-add-support-for-fadt-p_lvl2_up-flag.patch +++ b/queue/acpi-add-support-for-fadt-p_lvl2_up-flag.patch @@ -27,8 +27,8 @@ Signed-off-by: Greg Kroah-Hartman drivers/acpi/processor_idle.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) ---- linux-2.6.14.3.orig/drivers/acpi/processor_idle.c -+++ linux-2.6.14.3/drivers/acpi/processor_idle.c +--- linux-2.6.14.4.orig/drivers/acpi/processor_idle.c ++++ linux-2.6.14.4/drivers/acpi/processor_idle.c @@ -261,6 +261,16 @@ static void acpi_processor_idle(void) cx->usage++; diff --git a/queue/acpi-fix-null-deref-in-video-lcd-brightness.patch b/queue/acpi-fix-null-deref-in-video-lcd-brightness.patch index c591389ac4d..5ecbbc6ff9c 100644 --- a/queue/acpi-fix-null-deref-in-video-lcd-brightness.patch +++ b/queue/acpi-fix-null-deref-in-video-lcd-brightness.patch @@ -19,14 +19,11 @@ Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman Signed-off-by: Chris Wright --- - drivers/acpi/video.c | 2 +- - 1 files changed, 1 insertion(+), 1 deletion(-) + 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-2.6.14.y/drivers/acpi/video.c -=================================================================== ---- linux-2.6.14.y.orig/drivers/acpi/video.c -+++ linux-2.6.14.y/drivers/acpi/video.c +--- linux-2.6.14.4.orig/drivers/acpi/video.c ++++ linux-2.6.14.4/drivers/acpi/video.c @@ -813,7 +813,7 @@ acpi_video_device_write_brightness(struc ACPI_FUNCTION_TRACE("acpi_video_device_write_brightness"); diff --git a/queue/acpi-prefer-_cst-over-fadt-for-c-state-capabilities.patch b/queue/acpi-prefer-_cst-over-fadt-for-c-state-capabilities.patch index 0b2b3dd2a81..23ccdf92123 100644 --- a/queue/acpi-prefer-_cst-over-fadt-for-c-state-capabilities.patch +++ b/queue/acpi-prefer-_cst-over-fadt-for-c-state-capabilities.patch @@ -28,9 +28,9 @@ Signed-off-by: Greg Kroah-Hartman drivers/acpi/processor_idle.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---- linux-2.6.14.3.orig/drivers/acpi/processor_idle.c -+++ linux-2.6.14.3/drivers/acpi/processor_idle.c -@@ -687,7 +687,7 @@ static int acpi_processor_get_power_info +--- linux-2.6.14.4.orig/drivers/acpi/processor_idle.c ++++ linux-2.6.14.4/drivers/acpi/processor_idle.c +@@ -706,7 +706,7 @@ static int acpi_processor_get_power_info /* Validate number of power states discovered */ if (pr->power.count < 2) @@ -39,7 +39,7 @@ Signed-off-by: Greg Kroah-Hartman end: acpi_os_free(buffer.pointer); -@@ -838,11 +838,11 @@ static int acpi_processor_get_power_info +@@ -857,11 +857,11 @@ static int acpi_processor_get_power_info * this function */ result = acpi_processor_get_power_info_cst(pr); diff --git a/queue/dpt_i2o-fix-for-deadlock-condition.patch b/queue/dpt_i2o-fix-for-deadlock-condition.patch index 57642db3918..ed597409159 100644 --- a/queue/dpt_i2o-fix-for-deadlock-condition.patch +++ b/queue/dpt_i2o-fix-for-deadlock-condition.patch @@ -22,14 +22,11 @@ Signed-off-by: Andrew Morton Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- - drivers/scsi/dpt_i2o.c | 25 ++++++++++++++++++++----- - 1 files changed, 20 insertions(+), 5 deletions(-) + 1 file changed, 20 insertions(+), 5 deletions(-) -Index: linux-2.6.14.y/drivers/scsi/dpt_i2o.c -=================================================================== ---- linux-2.6.14.y.orig/drivers/scsi/dpt_i2o.c -+++ linux-2.6.14.y/drivers/scsi/dpt_i2o.c +--- linux-2.6.14.4.orig/drivers/scsi/dpt_i2o.c ++++ linux-2.6.14.4/drivers/scsi/dpt_i2o.c @@ -660,7 +660,12 @@ static int adpt_abort(struct scsi_cmnd * msg[2] = 0; msg[3]= 0; diff --git a/queue/fix-bridge-nf-ipv6-length-check.patch b/queue/fix-bridge-nf-ipv6-length-check.patch index fcb13c96318..ea30e9a396e 100644 --- a/queue/fix-bridge-nf-ipv6-length-check.patch +++ b/queue/fix-bridge-nf-ipv6-length-check.patch @@ -18,14 +18,11 @@ Signed-off-by: David S. Miller Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- - net/bridge/br_netfilter.c | 17 +++++++---------- - 1 files changed, 7 insertions(+), 10 deletions(-) + 1 file changed, 7 insertions(+), 10 deletions(-) -Index: linux-2.6.14.y/net/bridge/br_netfilter.c -=================================================================== ---- linux-2.6.14.y.orig/net/bridge/br_netfilter.c -+++ linux-2.6.14.y/net/bridge/br_netfilter.c +--- linux-2.6.14.4.orig/net/bridge/br_netfilter.c ++++ linux-2.6.14.4/net/bridge/br_netfilter.c @@ -295,7 +295,7 @@ static int check_hbh_len(struct sk_buff len -= 2; diff --git a/queue/fix-cta_proto_num-attribute-size-in-ctnetlink.patch b/queue/fix-cta_proto_num-attribute-size-in-ctnetlink.patch index d58232f014a..e7da2797f7c 100644 --- a/queue/fix-cta_proto_num-attribute-size-in-ctnetlink.patch +++ b/queue/fix-cta_proto_num-attribute-size-in-ctnetlink.patch @@ -15,9 +15,13 @@ Based on oryginal patch by Patrick McHardy Signed-off-by: Krzysztof Piotr Oledzki Signed-off-by: Greg Kroah-Hartman ---- a/net/ipv4/netfilter/ip_conntrack_netlink.c -+++ b/net/ipv4/netfilter/ip_conntrack_netlink.c -@@ -503,7 +503,7 @@ ctnetlink_parse_tuple_ip(struct nfattr * +--- + net/ipv4/netfilter/ip_conntrack_netlink.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- linux-2.6.14.4.orig/net/ipv4/netfilter/ip_conntrack_netlink.c ++++ linux-2.6.14.4/net/ipv4/netfilter/ip_conntrack_netlink.c +@@ -506,7 +506,7 @@ nfattr_failure: } static const int cta_min_proto[CTA_PROTO_MAX] = { @@ -26,7 +30,7 @@ Signed-off-by: Greg Kroah-Hartman [CTA_PROTO_SRC_PORT-1] = sizeof(u_int16_t), [CTA_PROTO_DST_PORT-1] = sizeof(u_int16_t), [CTA_PROTO_ICMP_TYPE-1] = sizeof(u_int8_t), -@@ -528,7 +528,7 @@ ctnetlink_parse_tuple_proto(struct nfatt +@@ -532,7 +532,7 @@ ctnetlink_parse_tuple_proto(struct nfatt if (!tb[CTA_PROTO_NUM-1]) return -EINVAL; @@ -35,8 +39,3 @@ Signed-off-by: Greg Kroah-Hartman proto = ip_conntrack_proto_find_get(tuple->dst.protonum); -_______________________________________________ -stable mailing list -stable@linux.kernel.org -http://linux.kernel.org/mailman/listinfo/stable - diff --git a/queue/fix-incorrect-dependency-for-IP6_NF_TARGET_NFQUEUE.patch b/queue/fix-incorrect-dependency-for-IP6_NF_TARGET_NFQUEUE.patch index a642dd1a89a..dd92baf91f0 100644 --- a/queue/fix-incorrect-dependency-for-IP6_NF_TARGET_NFQUEUE.patch +++ b/queue/fix-incorrect-dependency-for-IP6_NF_TARGET_NFQUEUE.patch @@ -14,14 +14,11 @@ Signed-off-by: David S. Miller Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- - net/ipv6/netfilter/Kconfig | 2 +- - 1 files changed, 1 insertion(+), 1 deletion(-) + 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-2.6.14.y/net/ipv6/netfilter/Kconfig -=================================================================== ---- linux-2.6.14.y.orig/net/ipv6/netfilter/Kconfig -+++ linux-2.6.14.y/net/ipv6/netfilter/Kconfig +--- linux-2.6.14.4.orig/net/ipv6/netfilter/Kconfig ++++ linux-2.6.14.4/net/ipv6/netfilter/Kconfig @@ -211,7 +211,7 @@ config IP6_NF_TARGET_REJECT config IP6_NF_TARGET_NFQUEUE diff --git a/queue/fix-nat-init-order.patch b/queue/fix-nat-init-order.patch index 06790cc27a1..78626a1d99a 100644 --- a/queue/fix-nat-init-order.patch +++ b/queue/fix-nat-init-order.patch @@ -17,14 +17,11 @@ Signed-off-by: David S. Miller Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- - net/ipv4/netfilter/Makefile | 3 ++- - 1 files changed, 2 insertions(+), 1 deletion(-) + 1 file changed, 2 insertions(+), 1 deletion(-) -Index: linux-2.6.14.y/net/ipv4/netfilter/Makefile -=================================================================== ---- linux-2.6.14.y.orig/net/ipv4/netfilter/Makefile -+++ linux-2.6.14.y/net/ipv4/netfilter/Makefile +--- linux-2.6.14.4.orig/net/ipv4/netfilter/Makefile ++++ linux-2.6.14.4/net/ipv4/netfilter/Makefile @@ -12,6 +12,7 @@ ip_nat_pptp-objs := ip_nat_helper_pptp.o # connection tracking diff --git a/queue/fix-unbalanced-read_unlock_bh-in-ctnetlink.patch b/queue/fix-unbalanced-read_unlock_bh-in-ctnetlink.patch index efa3ef28768..9837b80ad0a 100644 --- a/queue/fix-unbalanced-read_unlock_bh-in-ctnetlink.patch +++ b/queue/fix-unbalanced-read_unlock_bh-in-ctnetlink.patch @@ -19,9 +19,11 @@ Signed-off-by: Krzysztof Piotr Oledzki Signed-off-by: Greg Kroah-Hartman --- + net/ipv4/netfilter/ip_conntrack_proto_tcp.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) ---- a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c -+++ b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c +--- linux-2.6.14.4.orig/net/ipv4/netfilter/ip_conntrack_proto_tcp.c ++++ linux-2.6.14.4/net/ipv4/netfilter/ip_conntrack_proto_tcp.c @@ -341,9 +341,10 @@ static int tcp_print_conntrack(struct se static int tcp_to_nfattr(struct sk_buff *skb, struct nfattr *nfa, const struct ip_conntrack *ct) @@ -34,9 +36,3 @@ Signed-off-by: Greg Kroah-Hartman NFA_PUT(skb, CTA_PROTOINFO_TCP_STATE, sizeof(u_int8_t), &ct->proto.tcp.state); read_unlock_bh(&tcp_lock); - -_______________________________________________ -stable mailing list -stable@linux.kernel.org -http://linux.kernel.org/mailman/listinfo/stable - diff --git a/queue/fix-vlan-checksumming.patch b/queue/fix-vlan-checksumming.patch index 4b14ef7671d..59788fcd0f7 100644 --- a/queue/fix-vlan-checksumming.patch +++ b/queue/fix-vlan-checksumming.patch @@ -17,14 +17,11 @@ Signed-off-by: David S. Miller Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- - net/8021q/vlan_dev.c | 3 +++ - 1 files changed, 3 insertions(+) + 1 file changed, 3 insertions(+) -Index: linux-2.6.14.y/net/8021q/vlan_dev.c -=================================================================== ---- linux-2.6.14.y.orig/net/8021q/vlan_dev.c -+++ linux-2.6.14.y/net/8021q/vlan_dev.c +--- linux-2.6.14.4.orig/net/8021q/vlan_dev.c ++++ linux-2.6.14.4/net/8021q/vlan_dev.c @@ -165,6 +165,9 @@ int vlan_skb_recv(struct sk_buff *skb, s skb_pull(skb, VLAN_HLEN); /* take off the VLAN header (4 bytes currently) */ diff --git a/queue/gre-fix-hardware-checksum-modification.patch b/queue/gre-fix-hardware-checksum-modification.patch index b9850f123b9..ef6b22498b3 100644 --- a/queue/gre-fix-hardware-checksum-modification.patch +++ b/queue/gre-fix-hardware-checksum-modification.patch @@ -17,14 +17,11 @@ Signed-off-by: David S. Miller Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- - net/ipv4/ip_gre.c | 2 +- - 1 files changed, 1 insertion(+), 1 deletion(-) + 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-2.6.14.y/net/ipv4/ip_gre.c -=================================================================== ---- linux-2.6.14.y.orig/net/ipv4/ip_gre.c -+++ linux-2.6.14.y/net/ipv4/ip_gre.c +--- linux-2.6.14.4.orig/net/ipv4/ip_gre.c ++++ linux-2.6.14.4/net/ipv4/ip_gre.c @@ -617,7 +617,7 @@ static int ipgre_rcv(struct sk_buff *skb skb->mac.raw = skb->nh.raw; diff --git a/queue/input-fix-an-OOPS-in-HID-driver.patch b/queue/input-fix-an-OOPS-in-HID-driver.patch index a30766a3d23..73fd552af22 100644 --- a/queue/input-fix-an-OOPS-in-HID-driver.patch +++ b/queue/input-fix-an-OOPS-in-HID-driver.patch @@ -13,14 +13,11 @@ Acked-by: Vojtech Pavlik Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- - drivers/usb/input/hid-input.c | 1 + - 1 files changed, 1 insertion(+) + 1 file changed, 1 insertion(+) -Index: linux-2.6.14.y/drivers/usb/input/hid-input.c -=================================================================== ---- linux-2.6.14.y.orig/drivers/usb/input/hid-input.c -+++ linux-2.6.14.y/drivers/usb/input/hid-input.c +--- linux-2.6.14.4.orig/drivers/usb/input/hid-input.c ++++ linux-2.6.14.4/drivers/usb/input/hid-input.c @@ -137,6 +137,7 @@ static void hidinput_configure_usage(str switch (usage->hid & 0xffff) { case 0xba: map_abs(ABS_RUDDER); break; diff --git a/queue/ipsec-perform-SA-switchover-immediately.patch b/queue/ipsec-perform-SA-switchover-immediately.patch index 0538e8112e9..4f1c283cb79 100644 --- a/queue/ipsec-perform-SA-switchover-immediately.patch +++ b/queue/ipsec-perform-SA-switchover-immediately.patch @@ -14,16 +14,13 @@ Signed-off-by: David S. Miller Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- - include/net/xfrm.h | 1 + net/xfrm/xfrm_policy.c | 19 ++++++++++++++----- net/xfrm/xfrm_state.c | 5 +++++ 3 files changed, 20 insertions(+), 5 deletions(-) -Index: linux-2.6.14.y/include/net/xfrm.h -=================================================================== ---- linux-2.6.14.y.orig/include/net/xfrm.h -+++ linux-2.6.14.y/include/net/xfrm.h +--- linux-2.6.14.4.orig/include/net/xfrm.h ++++ linux-2.6.14.4/include/net/xfrm.h @@ -890,6 +890,7 @@ struct xfrm_state * xfrm_find_acq(u8 mod extern void xfrm_policy_flush(void); extern int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol); @@ -32,10 +29,8 @@ Index: linux-2.6.14.y/include/net/xfrm.h extern int xfrm_bundle_ok(struct xfrm_dst *xdst, struct flowi *fl, int family); extern void xfrm_init_pmtu(struct dst_entry *dst); -Index: linux-2.6.14.y/net/xfrm/xfrm_policy.c -=================================================================== ---- linux-2.6.14.y.orig/net/xfrm/xfrm_policy.c -+++ linux-2.6.14.y/net/xfrm/xfrm_policy.c +--- linux-2.6.14.4.orig/net/xfrm/xfrm_policy.c ++++ linux-2.6.14.4/net/xfrm/xfrm_policy.c @@ -1014,13 +1014,12 @@ int __xfrm_route_forward(struct sk_buff } EXPORT_SYMBOL(__xfrm_route_forward); @@ -71,10 +66,8 @@ Index: linux-2.6.14.y/net/xfrm/xfrm_policy.c void xfrm_init_pmtu(struct dst_entry *dst) { do { -Index: linux-2.6.14.y/net/xfrm/xfrm_state.c -=================================================================== ---- linux-2.6.14.y.orig/net/xfrm/xfrm_state.c -+++ linux-2.6.14.y/net/xfrm/xfrm_state.c +--- linux-2.6.14.4.orig/net/xfrm/xfrm_state.c ++++ linux-2.6.14.4/net/xfrm/xfrm_state.c @@ -435,6 +435,8 @@ void xfrm_state_insert(struct xfrm_state spin_lock_bh(&xfrm_state_lock); __xfrm_state_insert(x); diff --git a/queue/ipv6-fix-route-lifetime.patch b/queue/ipv6-fix-route-lifetime.patch index c520e0e7a8c..0fe28b175a6 100644 --- a/queue/ipv6-fix-route-lifetime.patch +++ b/queue/ipv6-fix-route-lifetime.patch @@ -21,15 +21,12 @@ Signed-off-by: David S. Miller Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- - net/ipv6/addrconf.c | 16 ++++++++++++---- net/ipv6/route.c | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) -Index: linux-2.6.14.y/net/ipv6/addrconf.c -=================================================================== ---- linux-2.6.14.y.orig/net/ipv6/addrconf.c -+++ linux-2.6.14.y/net/ipv6/addrconf.c +--- linux-2.6.14.4.orig/net/ipv6/addrconf.c ++++ linux-2.6.14.4/net/ipv6/addrconf.c @@ -1456,9 +1456,17 @@ void addrconf_prefix_rcv(struct net_devi not good. */ @@ -65,10 +62,8 @@ Index: linux-2.6.14.y/net/ipv6/addrconf.c } if (rt) dst_release(&rt->u.dst); -Index: linux-2.6.14.y/net/ipv6/route.c -=================================================================== ---- linux-2.6.14.y.orig/net/ipv6/route.c -+++ linux-2.6.14.y/net/ipv6/route.c +--- linux-2.6.14.4.orig/net/ipv6/route.c ++++ linux-2.6.14.4/net/ipv6/route.c @@ -829,7 +829,7 @@ int ip6_route_add(struct in6_rtmsg *rtms } diff --git a/queue/rtnetlink-fix-RTNLGRP-definitions-in-rtnetlink.h.patch b/queue/rtnetlink-fix-RTNLGRP-definitions-in-rtnetlink.h.patch index 8c95adbbabd..3a92a614b21 100644 --- a/queue/rtnetlink-fix-RTNLGRP-definitions-in-rtnetlink.h.patch +++ b/queue/rtnetlink-fix-RTNLGRP-definitions-in-rtnetlink.h.patch @@ -22,14 +22,11 @@ Signed-off-by: David S. Miller Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- - include/linux/rtnetlink.h | 4 ++++ - 1 files changed, 4 insertions(+) + 1 file changed, 4 insertions(+) -Index: linux-2.6.14.y/include/linux/rtnetlink.h -=================================================================== ---- linux-2.6.14.y.orig/include/linux/rtnetlink.h -+++ linux-2.6.14.y/include/linux/rtnetlink.h +--- linux-2.6.14.4.orig/include/linux/rtnetlink.h ++++ linux-2.6.14.4/include/linux/rtnetlink.h @@ -866,6 +866,7 @@ enum rtnetlink_groups { #define RTNLGRP_IPV4_MROUTE RTNLGRP_IPV4_MROUTE RTNLGRP_IPV4_ROUTE, -- 2.47.3