]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
patch refresh
authorGreg Kroah-Hartman <gregkh@suse.de>
Fri, 23 Dec 2005 18:56:26 +0000 (10:56 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 23 Dec 2005 18:56:26 +0000 (10:56 -0800)
15 files changed:
queue/acpi-add-support-for-fadt-p_lvl2_up-flag.patch
queue/acpi-fix-null-deref-in-video-lcd-brightness.patch
queue/acpi-prefer-_cst-over-fadt-for-c-state-capabilities.patch
queue/dpt_i2o-fix-for-deadlock-condition.patch
queue/fix-bridge-nf-ipv6-length-check.patch
queue/fix-cta_proto_num-attribute-size-in-ctnetlink.patch
queue/fix-incorrect-dependency-for-IP6_NF_TARGET_NFQUEUE.patch
queue/fix-nat-init-order.patch
queue/fix-unbalanced-read_unlock_bh-in-ctnetlink.patch
queue/fix-vlan-checksumming.patch
queue/gre-fix-hardware-checksum-modification.patch
queue/input-fix-an-OOPS-in-HID-driver.patch
queue/ipsec-perform-SA-switchover-immediately.patch
queue/ipv6-fix-route-lifetime.patch
queue/rtnetlink-fix-RTNLGRP-definitions-in-rtnetlink.h.patch

index 18f85149c5b75c144ee3f8460528e7f4d8bc61e3..e8141602293817eab437269d07f017eace5ab181 100644 (file)
@@ -27,8 +27,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  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++;
index c591389ac4d3853cdae17e92e69f8b70b8b4a749..5ecbbc6ff9c88b9503ed745b9f1b32b6f8d1e1e5 100644 (file)
@@ -19,14 +19,11 @@ Signed-off-by: Andrew Morton <akpm@osdl.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 Signed-off-by: Chris Wright <chrisw@redhat.com>
 ---
-
  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");
index 0b2b3dd2a81e0316ebbbda1abb6ceb10555241af..23ccdf92123955eed899999f5e5a399f290479d7 100644 (file)
@@ -28,9 +28,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  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 <gregkh@suse.de>
  
        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);
index 57642db391891135b8e3567c99f113230d85e518..ed5974091599133b946f46d6ee2d6d95dc4ac0ff 100644 (file)
@@ -22,14 +22,11 @@ Signed-off-by: Andrew Morton <akpm@osdl.org>
 Signed-off-by: Chris Wright <chrisw@redhat.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  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; 
index fcb13c96318978c73a80881f0e8ef89367ca8969..ea30e9a396e9f6b1cb4d5877ca63cba1422331e1 100644 (file)
@@ -18,14 +18,11 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Chris Wright <chrisw@redhat.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  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;
  
index d58232f014a29259070ca002e2144d283aa008e4..e7da2797f7c26f80644eee8bf84b37ba42dd9919 100644 (file)
@@ -15,9 +15,13 @@ Based on oryginal patch by Patrick McHardy <kaber@trash.net>
 Signed-off-by: Krzysztof Piotr Oledzki <ole@ans.pl>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
---- 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 <gregkh@suse.de>
        [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 <gregkh@suse.de>
  
        proto = ip_conntrack_proto_find_get(tuple->dst.protonum);
  
-_______________________________________________
-stable mailing list
-stable@linux.kernel.org
-http://linux.kernel.org/mailman/listinfo/stable
-
index a642dd1a89a0dff480da28b38d7703c0cac44ac3..dd92baf91f0ca313fecba5c1df791524f16492c3 100644 (file)
@@ -14,14 +14,11 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Chris Wright <chrisw@redhat.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  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
index 06790cc27a19bf7379aa035cb1f8443a199839eb..78626a1d99ab9d9e43c7f99e7668491029e00d02 100644 (file)
@@ -17,14 +17,11 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Chris Wright <chrisw@redhat.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  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
index efa3ef28768f8acfd575735b40805e75353d52c9..9837b80ad0a3093e7ea3b306b8d70d61d0ff2b4b 100644 (file)
@@ -19,9 +19,11 @@ Signed-off-by: Krzysztof Piotr Oledzki <ole@ans.pl>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 ---
+ 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 <gregkh@suse.de>
        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
-
index 4b14ef7671d412147e1f96a620088f3fa2c2d055..59788fcd0f703d1947a6fea9342433a9a2609e5e 100644 (file)
@@ -17,14 +17,11 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Chris Wright <chrisw@redhat.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  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) */
index b9850f123b9fe3872317fe7f50512c9f768145f9..ef6b22498b30167e52dfbac4fa0715ef4311a311 100644 (file)
@@ -17,14 +17,11 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Chris Wright <chrisw@redhat.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  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;
index a30766a3d233d12eb94446a851bf7577550d52cb..73fd552af227ea66905c0e383a194da6c837dfc7 100644 (file)
@@ -13,14 +13,11 @@ Acked-by: Vojtech Pavlik <vojtech@suse.cz>
 Signed-off-by: Chris Wright <chrisw@redhat.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  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;
index 0538e8112e98fecc368ab68d85912e586f846391..4f1c283cb79c9f2c21107e093b5847ef621095e9 100644 (file)
@@ -14,16 +14,13 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Chris Wright <chrisw@redhat.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  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);
index c520e0e7a8c61d49319be6e7168fd111e1f7cf36..0fe28b175a680b21aff6986efa649abb329569ad 100644 (file)
@@ -21,15 +21,12 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Chris Wright <chrisw@redhat.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  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
        }
  
index 8c95adbbabdf8770311a7408171601793bad395c..3a92a614b2149136fe62be119837d7bbbe3dbbe4 100644 (file)
@@ -22,14 +22,11 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Chris Wright <chrisw@redhat.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  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,