Author: mguevara Date: Mon Jan 8 15:55:53 2007 GMT
Module: SOURCES Tag: LINUX_2_6_20
---- Log message:
- 2.6.20-rc4 work in progress
---- Files affected:
SOURCES:
pom-ng-ROUTE-20061213.patch (1.1.2.2 -> 1.1.2.2.2.1) ,
pom-ng-mms-conntrack-nat-20061213.patch (1.1.2.2 -> 1.1.2.2.2.1) ,
pom-ng-IPMARK-20061213.patch (1.1.2.3 -> 1.1.2.3.2.1) ,
linux-2.6-cpuset_virtualization.patch (1.1.2.12 -> 1.1.2.12.2.1) ,
esfq-kernel.patch (1.1.2.4 -> 1.1.2.4.2.1) , linux-2.6-sk98lin-8.36.1.3.patch
(1.1.2.7 -> 1.1.2.7.2.1)
---- Diffs:
================================================================
Index: SOURCES/pom-ng-ROUTE-20061213.patch
diff -u SOURCES/pom-ng-ROUTE-20061213.patch:1.1.2.2
SOURCES/pom-ng-ROUTE-20061213.patch:1.1.2.2.2.1
--- SOURCES/pom-ng-ROUTE-20061213.patch:1.1.2.2 Tue Dec 19 20:37:46 2006
+++ SOURCES/pom-ng-ROUTE-20061213.patch Mon Jan 8 16:55:47 2007
@@ -617,7 +617,7 @@
<file:Documentation/modules.txt>. If unsure, say `N'.
+config IP6_NF_TARGET_ROUTE
-+ tristate ' ROUTE target support'
++ tristate 'ROUTE target support'
+ depends on IP6_NF_MANGLE
+ help
+ This option adds a `ROUTE' target, which enables you to setup unusual
@@ -841,8 +841,8 @@
+ const struct net_device *out,
+ unsigned int hooknum,
+ const struct xt_target *target,
-+ const void *targinfo,
-+ void *userinfo)
++ const void *targinfo
++ )
+{
+ const struct ip6t_route_target_info *route_info = targinfo;
+ struct sk_buff *skb = *pskb;
@@ -911,7 +911,7 @@
+ const void *entry,
+ const struct xt_target *target,
+ void *targinfo,
-+ unsigned int targinfosize,
++
+ unsigned int hook_mask)
+{
+ if (strcmp(tablename, "mangle") != 0) {
@@ -919,12 +919,12 @@
+ return 0;
+ }
+
-+ if (targinfosize != IP6T_ALIGN(sizeof(struct ip6t_route_target_info))) {
++ /* if (targinfosize != IP6T_ALIGN(sizeof(struct
ip6t_route_target_info))) {
+ printk(KERN_WARNING "ip6t_ROUTE: targinfosize %u != %Zu\n",
+ targinfosize,
+ IP6T_ALIGN(sizeof(struct ip6t_route_target_info)));
+ return 0;
-+ }
++ } */
+
+ return 1;
+}
================================================================
Index: SOURCES/pom-ng-mms-conntrack-nat-20061213.patch
diff -u SOURCES/pom-ng-mms-conntrack-nat-20061213.patch:1.1.2.2
SOURCES/pom-ng-mms-conntrack-nat-20061213.patch:1.1.2.2.2.1
--- SOURCES/pom-ng-mms-conntrack-nat-20061213.patch:1.1.2.2 Thu Dec 14
15:36:08 2006
+++ SOURCES/pom-ng-mms-conntrack-nat-20061213.patch Mon Jan 8 16:55:47 2007
@@ -60,7 +60,7 @@
diff -NurpP --minimal
/home/users/builder/linux-2.6.19/net/ipv4/netfilter/Kconfig
linux-2.6.19/net/ipv4/netfilter/Kconfig
--- /home/users/builder/linux-2.6.19/net/ipv4/netfilter/Kconfig
2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/net/ipv4/netfilter/Kconfig 2006-12-14 10:36:22.000000000
+0100
-@@ -623,5 +623,23 @@ config IP_NF_ARP_MANGLE
+@@ -860,5 +860,23 @@ config IP_NF_ARP_MANGLE
Allows altering the ARP packet payload: source and destination
hardware and network addresses.
@@ -87,7 +87,7 @@
diff -NurpP --minimal
/home/users/builder/linux-2.6.19/net/ipv4/netfilter/Makefile
linux-2.6.19/net/ipv4/netfilter/Makefile
--- /home/users/builder/linux-2.6.19/net/ipv4/netfilter/Makefile
2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/net/ipv4/netfilter/Makefile 2006-12-14 10:36:22.000000000
+0100
-@@ -25,6 +25,7 @@ obj-$(CONFIG_IP_NF_CONNTRACK_NETLINK) +=
+@@ -31,6 +31,7 @@ obj-$(CONFIG_IP_NF_CONNTRACK_NETLINK) +=
obj-$(CONFIG_IP_NF_CT_PROTO_SCTP) += ip_conntrack_proto_sctp.o
# connection tracking helpers
@@ -95,10 +95,10 @@
obj-$(CONFIG_IP_NF_H323) += ip_conntrack_h323.o
obj-$(CONFIG_IP_NF_PPTP) += ip_conntrack_pptp.o
obj-$(CONFIG_IP_NF_AMANDA) += ip_conntrack_amanda.o
-@@ -35,6 +36,7 @@ obj-$(CONFIG_IP_NF_SIP) += ip_conntrack_
+@@ -41,6 +41,7 @@ obj-$(CONFIG_IP_NF_SIP) += ip_conntrack_
obj-$(CONFIG_IP_NF_NETBIOS_NS) += ip_conntrack_netbios_ns.o
- # NAT helpers
+ # NAT helpers (ip_conntrack)
+obj-$(CONFIG_IP_NF_NAT_MMS) += ip_nat_mms.o
obj-$(CONFIG_IP_NF_NAT_H323) += ip_nat_h323.o
obj-$(CONFIG_IP_NF_NAT_PPTP) += ip_nat_pptp.o
================================================================
Index: SOURCES/pom-ng-IPMARK-20061213.patch
diff -u SOURCES/pom-ng-IPMARK-20061213.patch:1.1.2.3
SOURCES/pom-ng-IPMARK-20061213.patch:1.1.2.3.2.1
--- SOURCES/pom-ng-IPMARK-20061213.patch:1.1.2.3 Tue Dec 19 20:58:04 2006
+++ SOURCES/pom-ng-IPMARK-20061213.patch Mon Jan 8 16:55:47 2007
@@ -93,8 +93,8 @@
+ mark &= ipmarkinfo->andmask;
+ mark |= ipmarkinfo->ormask;
+
-+ if ((*pskb)->nfmark != mark)
-+ (*pskb)->nfmark = mark;
++ if ((*pskb)->mark != mark)
++ (*pskb)->mark = mark;
+
+ return IPT_CONTINUE;
+}
================================================================
Index: SOURCES/linux-2.6-cpuset_virtualization.patch
diff -u SOURCES/linux-2.6-cpuset_virtualization.patch:1.1.2.12
SOURCES/linux-2.6-cpuset_virtualization.patch:1.1.2.12.2.1
--- SOURCES/linux-2.6-cpuset_virtualization.patch:1.1.2.12 Sat Dec 9
11:56:44 2006
+++ SOURCES/linux-2.6-cpuset_virtualization.patch Mon Jan 8 16:55:47 2007
@@ -34,9 +34,9 @@
--- linux-2.6.14.3/arch/ia64/kernel/setup.c 2005-11-24 23:10:21.000000000
+0100
+++ linux-2.6.14.3-cpusetvirt/arch/ia64/kernel/setup.c 2005-11-25
19:28:28.090979016 +0100
@@ -43,6 +43,7 @@
- #include <linux/initrd.h>
- #include <linux/pm.h>
#include <linux/cpufreq.h>
+ #include <linux/kexec.h>
+ #include <linux/crash_dump.h>
+#include <linux/cpuset.h>
#include <asm/ia32.h>
================================================================
Index: SOURCES/esfq-kernel.patch
diff -u SOURCES/esfq-kernel.patch:1.1.2.4 SOURCES/esfq-kernel.patch:1.1.2.4.2.1
--- SOURCES/esfq-kernel.patch:1.1.2.4 Thu Dec 14 20:36:25 2006
+++ SOURCES/esfq-kernel.patch Mon Jan 8 16:55:48 2007
@@ -246,7 +246,7 @@
+ struct iphdr *iph = skb->nh.iph;
+ h = iph->daddr;
+ hs = iph->saddr;
-+ nfm = skb->nfmark;
++ nfm = skb->mark;
+ h2 = hs^iph->protocol;
+ if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
+ (iph->protocol == IPPROTO_TCP ||
@@ -260,7 +260,7 @@
+ struct ipv6hdr *iph = skb->nh.ipv6h;
+ h = iph->daddr.s6_addr32[3];
+ hs = iph->saddr.s6_addr32[3];
-+ nfm = skb->nfmark;
++ nfm = skb->mark;
+ h2 = hs^iph->nexthdr;
+ if (iph->nexthdr == IPPROTO_TCP ||
+ iph->nexthdr == IPPROTO_UDP ||
@@ -271,7 +271,7 @@
+ default:
+ h = (u32)(unsigned long)skb->dst;
+ hs = (u32)(unsigned long)skb->sk;
-+ nfm = skb->nfmark;
++ nfm = skb->mark;
+ h2 = hs^skb->protocol;
+ }
+ switch(q->hash_kind)
================================================================
Index: SOURCES/linux-2.6-sk98lin-8.36.1.3.patch
diff -u SOURCES/linux-2.6-sk98lin-8.36.1.3.patch:1.1.2.7
SOURCES/linux-2.6-sk98lin-8.36.1.3.patch:1.1.2.7.2.1
--- SOURCES/linux-2.6-sk98lin-8.36.1.3.patch:1.1.2.7 Wed Dec 13 21:20:10 2006
+++ SOURCES/linux-2.6-sk98lin-8.36.1.3.patch Mon Jan 8 16:55:48 2007
@@ -40,8 +40,8 @@
+# History:
+#
+# $Log$
-+# Revision 1.1.2.7 2006/12/13 20:20:10 mguevara
-+# - 2.6.19 work in progress - stupid error
++# Revision 1.1.2.7.2.1 2007/01/08 15:55:48 mguevara
++# - 2.6.20-rc4 work in progress
+#
+# Revision 1.9.2.1 2005/04/11 09:01:18 mlindner
+# Fix: Copyright year changed
@@ -785,7 +785,7 @@
-/*
-** Interim definition of SK_DRV_TIMER placed in this file until
--** common modules have boon finallized
+-** common modules have been finalized
-*/
-#define SK_DRV_TIMER 11
-#define SK_DRV_MODERATION_TIMER 1
@@ -11309,7 +11309,7 @@
-/*******************************************************************************
-** Function : SkDimDisplayModerationSettings
--** Description : Displays the current settings regaring interrupt moderation
+-** Description : Displays the current settings regarding interrupt moderation
-** Programmer : Ralph Roesler
-** Last Modified: 22-mar-03
-** Returns : void (!)
@@ -11782,7 +11782,7 @@
-/*******************************************************************************
-** Function : DisableIntMod()
--** Description : Disbles the interrupt moderation independent of what inter-
+-** Description : Disables the interrupt moderation independent of what inter-
-** rupts are running or not
-** Programmer : Ralph Roesler
-** Last Modified: 23-mar-03
@@ -12634,7 +12634,7 @@
/*****************************************************************************
*
* setSettings - configures the settings of a selected adapter
-@@ -181,422 +635,719 @@
+@@ -181,403 +635,714 @@
* c)autonegotiation.
*
* Returns:
@@ -13641,6 +13641,10 @@
return 0;
}
+@@ -605,24 +605,8 @@
+ regs->len - B3_RI_WTO_R1);
+ }
+
-const struct ethtool_ops SkGeEthtoolOps = {
- .get_settings = getSettings,
- .set_settings = setSettings,
@@ -13659,6 +13663,8 @@
- .set_tx_csum = setTxCsum,
- .get_rx_csum = getRxCsum,
- .set_rx_csum = setRxCsum,
+- .get_regs = getRegs,
+- .get_regs_len = getRegsLen,
-};
+/*******************************************************************************
+ *
@@ -13709,7 +13715,7 @@
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
-@@ -38,85 +32,53 @@
+@@ -38,87 +32,55 @@
/******************************************************************************
*
@@ -13813,6 +13819,8 @@
#include <linux/init.h>
-#include <linux/dma-mapping.h>
-#include <linux/ip.h>
+ #include <linux/mii.h>
+ #include <linux/mm.h>
+#include <linux/ethtool.h>
+
+#ifdef CONFIG_PROC_FS
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/pom-ng-ROUTE-20061213.patch?r1=1.1.2.2&r2=1.1.2.2.2.1&f=u
http://cvs.pld-linux.org/SOURCES/pom-ng-mms-conntrack-nat-20061213.patch?r1=1.1.2.2&r2=1.1.2.2.2.1&f=u
http://cvs.pld-linux.org/SOURCES/pom-ng-IPMARK-20061213.patch?r1=1.1.2.3&r2=1.1.2.3.2.1&f=u
http://cvs.pld-linux.org/SOURCES/linux-2.6-cpuset_virtualization.patch?r1=1.1.2.12&r2=1.1.2.12.2.1&f=u
http://cvs.pld-linux.org/SOURCES/esfq-kernel.patch?r1=1.1.2.4&r2=1.1.2.4.2.1&f=u
http://cvs.pld-linux.org/SOURCES/linux-2.6-sk98lin-8.36.1.3.patch?r1=1.1.2.7&r2=1.1.2.7.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
