rpms/kernel-xen-2.6/devel linux-2.6-csum-missing-line.patch, 1.3.2.1, 1.3.2.2 linux-2.6-kill_skbuff_hack.patch, 1.3.2.1, 1.3.2.2
Eduardo Habkost (ehabkost)
fedora-extras-commits at redhat.com
Tue Aug 7 14:20:02 UTC 2007
- Previous message: rpms/arm-gp2x-linux-gcc/FC-6 .cvsignore, 1.4, 1.5 arm-gp2x-linux-gcc.spec, 1.3, 1.4 sources, 1.4, 1.5
- Next message: rpms/banshee/devel .cvsignore, 1.11, 1.12 banshee.spec, 1.34, 1.35 sources, 1.11, 1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ehabkost
Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6598
Modified Files:
Tag: private-ehabkost-testing-csum-patches
linux-2.6-csum-missing-line.patch
linux-2.6-kill_skbuff_hack.patch
Log Message:
Move xen-specific code to xen directory
Move the net/core/skbuff.c code of linux-2.6-kill_skbuff_hack.patch to
drivers/xen/core/checksum.c
linux-2.6-csum-missing-line.patch:
Index: linux-2.6-csum-missing-line.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-csum-missing-line.patch,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- linux-2.6-csum-missing-line.patch 6 Aug 2007 15:19:10 -0000 1.3.2.1
+++ linux-2.6-csum-missing-line.patch 7 Aug 2007 14:19:59 -0000 1.3.2.2
@@ -23,11 +23,11 @@
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
-Index: linux-2.6.20.i386/net/core/skbuff.c
+Index: patching/drivers/xen/core/checksum.c
===================================================================
---- linux-2.6.20.i386.orig/net/core/skbuff.c
-+++ linux-2.6.20.i386/net/core/skbuff.c
-@@ -2073,6 +2073,7 @@ int skb_checksum_setup(struct sk_buff *s
+--- patching.orig/drivers/xen/core/checksum.c
++++ patching/drivers/xen/core/checksum.c
+@@ -12,6 +12,7 @@ int skb_checksum_setup(struct sk_buff *s
skb->h.raw = (unsigned char *)skb->nh.iph + 4*skb->nh.iph->ihl;
if (skb->h.raw >= skb->tail)
goto out;
linux-2.6-kill_skbuff_hack.patch:
Index: linux-2.6-kill_skbuff_hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-kill_skbuff_hack.patch,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- linux-2.6-kill_skbuff_hack.patch 6 Aug 2007 15:19:10 -0000 1.3.2.1
+++ linux-2.6-kill_skbuff_hack.patch 7 Aug 2007 14:19:59 -0000 1.3.2.2
@@ -19,10 +19,10 @@
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
-Index: linux-2.6.20.i386/drivers/xen/netback/loopback.c
+Index: patching/drivers/xen/netback/loopback.c
===================================================================
---- linux-2.6.20.i386.orig/drivers/xen/netback/loopback.c
-+++ linux-2.6.20.i386/drivers/xen/netback/loopback.c
+--- patching.orig/drivers/xen/netback/loopback.c
++++ patching/drivers/xen/netback/loopback.c
@@ -149,16 +149,6 @@ static int loopback_start_xmit(struct sk
np->stats.rx_bytes += skb->len;
np->stats.rx_packets++;
@@ -40,10 +40,10 @@
skb->pkt_type = PACKET_HOST; /* overridden by eth_type_trans() */
skb->protocol = eth_type_trans(skb, dev);
skb->dev = dev;
-Index: linux-2.6.20.i386/drivers/xen/netback/netback.c
+Index: patching/drivers/xen/netback/netback.c
===================================================================
---- linux-2.6.20.i386.orig/drivers/xen/netback/netback.c
-+++ linux-2.6.20.i386/drivers/xen/netback/netback.c
+--- patching.orig/drivers/xen/netback/netback.c
++++ patching/drivers/xen/netback/netback.c
@@ -263,7 +263,6 @@ int netif_be_start_xmit(struct sk_buff *
/* Copy only the header fields we use in this driver. */
nskb->dev = skb->dev;
@@ -99,10 +99,10 @@
netif->stats.rx_bytes += skb->len;
netif->stats.rx_packets++;
-Index: linux-2.6.20.i386/drivers/xen/netfront/netfront.c
+Index: patching/drivers/xen/netfront/netfront.c
===================================================================
---- linux-2.6.20.i386.orig/drivers/xen/netfront/netfront.c
-+++ linux-2.6.20.i386/drivers/xen/netfront/netfront.c
+--- patching.orig/drivers/xen/netfront/netfront.c
++++ patching/drivers/xen/netfront/netfront.c
@@ -978,12 +978,12 @@ static int network_start_xmit(struct sk_
tx->flags = 0;
extra = NULL;
@@ -164,10 +164,10 @@
/* Pass it up. */
netif_receive_skb(skb);
-Index: linux-2.6.20.i386/include/linux/skbuff.h
+Index: patching/include/linux/skbuff.h
===================================================================
---- linux-2.6.20.i386.orig/include/linux/skbuff.h
-+++ linux-2.6.20.i386/include/linux/skbuff.h
+--- patching.orig/include/linux/skbuff.h
++++ patching/include/linux/skbuff.h
@@ -205,8 +205,6 @@ enum {
* @local_df: allow local fragmentation
* @cloned: Head may be cloned (check refcnt to be sure)
@@ -200,10 +200,10 @@
static inline void *skb_header_pointer(const struct sk_buff *skb, int offset,
int len, void *buffer)
{
-Index: linux-2.6.20.i386/net/core/dev.c
+Index: patching/net/core/dev.c
===================================================================
---- linux-2.6.20.i386.orig/net/core/dev.c
-+++ linux-2.6.20.i386/net/core/dev.c
+--- patching.orig/net/core/dev.c
++++ patching/net/core/dev.c
@@ -117,12 +117,6 @@
#include <linux/err.h>
#include <linux/ctype.h>
@@ -302,23 +302,11 @@
#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
EXPORT_SYMBOL(br_handle_frame_hook);
-Index: linux-2.6.20.i386/net/core/skbuff.c
+Index: patching/net/core/skbuff.c
===================================================================
---- linux-2.6.20.i386.orig/net/core/skbuff.c
-+++ linux-2.6.20.i386/net/core/skbuff.c
-@@ -66,6 +66,11 @@
- #include <asm/uaccess.h>
- #include <asm/system.h>
-
-+#include <linux/if_ether.h>
-+#include <linux/tcp.h>
-+#include <linux/udp.h>
-+#include <net/ip.h>
-+
- #include "kmap_skb.h"
-
- static struct kmem_cache *skbuff_head_cache __read_mostly;
-@@ -470,10 +475,6 @@ struct sk_buff *skb_clone(struct sk_buff
+--- patching.orig/net/core/skbuff.c
++++ patching/net/core/skbuff.c
+@@ -470,10 +470,6 @@ struct sk_buff *skb_clone(struct sk_buff
C(local_df);
n->cloned = 1;
n->nohdr = 0;
@@ -329,49 +317,10 @@
C(pkt_type);
C(ip_summed);
C(priority);
-@@ -2065,6 +2066,38 @@ void __init skb_init(void)
- NULL, NULL);
- }
-
-+int skb_checksum_setup(struct sk_buff *skb)
-+{
-+ if (skb->protocol != htons(ETH_P_IP))
-+ goto out;
-+ skb->h.raw = (unsigned char *)skb->nh.iph + 4*skb->nh.iph->ihl;
-+ if (skb->h.raw >= skb->tail)
-+ goto out;
-+ switch (skb->nh.iph->protocol) {
-+ case IPPROTO_TCP:
-+ skb->csum_offset = offsetof(struct tcphdr, check);
-+ break;
-+ case IPPROTO_UDP:
-+ skb->csum_offset = offsetof(struct udphdr, check);
-+ break;
-+ default:
-+ if (net_ratelimit())
-+ printk(KERN_ERR "Attempting to checksum a non-"
-+ "TCP/UDP packet, dropping a protocol"
-+ " %d packet", skb->nh.iph->protocol);
-+ goto out;
-+ }
-+ if ((skb->h.raw + skb->csum_offset + 2) > skb->tail)
-+ goto out;
-+ skb->ip_summed = CHECKSUM_PARTIAL;
-+
-+ return 0;
-+out:
-+ return -EPROTO;
-+}
-+EXPORT_SYMBOL(skb_checksum_setup);
-+
-+
- EXPORT_SYMBOL(___pskb_trim);
- EXPORT_SYMBOL(__kfree_skb);
- EXPORT_SYMBOL(kfree_skb);
-Index: linux-2.6.20.i386/net/ipv4/netfilter/ip_nat_proto_tcp.c
+Index: patching/net/ipv4/netfilter/ip_nat_proto_tcp.c
===================================================================
---- linux-2.6.20.i386.orig/net/ipv4/netfilter/ip_nat_proto_tcp.c
-+++ linux-2.6.20.i386/net/ipv4/netfilter/ip_nat_proto_tcp.c
+--- patching.orig/net/ipv4/netfilter/ip_nat_proto_tcp.c
++++ patching/net/ipv4/netfilter/ip_nat_proto_tcp.c
@@ -129,15 +129,8 @@ tcp_manip_pkt(struct sk_buff **pskb,
if (hdrsize < sizeof(*hdr))
return 1;
@@ -388,10 +337,10 @@
return 1;
}
-Index: linux-2.6.20.i386/net/ipv4/netfilter/ip_nat_proto_udp.c
+Index: patching/net/ipv4/netfilter/ip_nat_proto_udp.c
===================================================================
---- linux-2.6.20.i386.orig/net/ipv4/netfilter/ip_nat_proto_udp.c
-+++ linux-2.6.20.i386/net/ipv4/netfilter/ip_nat_proto_udp.c
+--- patching.orig/net/ipv4/netfilter/ip_nat_proto_udp.c
++++ patching/net/ipv4/netfilter/ip_nat_proto_udp.c
@@ -115,16 +115,8 @@ udp_manip_pkt(struct sk_buff **pskb,
}
@@ -409,10 +358,10 @@
if (!hdr->check)
hdr->check = CSUM_MANGLED_0;
}
-Index: linux-2.6.20.i386/net/ipv4/xfrm4_output.c
+Index: patching/net/ipv4/xfrm4_output.c
===================================================================
---- linux-2.6.20.i386.orig/net/ipv4/xfrm4_output.c
-+++ linux-2.6.20.i386/net/ipv4/xfrm4_output.c
+--- patching.orig/net/ipv4/xfrm4_output.c
++++ patching/net/ipv4/xfrm4_output.c
@@ -18,8 +18,6 @@
#include <net/xfrm.h>
#include <net/icmp.h>
@@ -433,3 +382,57 @@
if (skb->ip_summed == CHECKSUM_PARTIAL) {
err = skb_checksum_help(skb);
+Index: patching/drivers/xen/core/Makefile
+===================================================================
+--- patching.orig/drivers/xen/core/Makefile
++++ patching/drivers/xen/core/Makefile
+@@ -2,7 +2,7 @@
+ # Makefile for the linux kernel.
+ #
+
+-obj-y := evtchn.o gnttab.o features.o reboot.o machine_reboot.o
++obj-y := evtchn.o gnttab.o features.o reboot.o machine_reboot.o checksum.o
+
+ obj-$(CONFIG_PROC_FS) += xen_proc.o
+ obj-$(CONFIG_SYSFS) += hypervisor_sysfs.o
+Index: patching/drivers/xen/core/checksum.c
+===================================================================
+--- /dev/null
++++ patching/drivers/xen/core/checksum.c
+@@ -0,0 +1,36 @@
++#include <linux/skbuff.h>
++#include <linux/if_ether.h>
++#include <linux/tcp.h>
++#include <linux/udp.h>
++#include <net/ip.h>
++
++int skb_checksum_setup(struct sk_buff *skb)
++{
++ if (skb->protocol != htons(ETH_P_IP))
++ goto out;
++ skb->h.raw = (unsigned char *)skb->nh.iph + 4*skb->nh.iph->ihl;
++ if (skb->h.raw >= skb->tail)
++ goto out;
++ switch (skb->nh.iph->protocol) {
++ case IPPROTO_TCP:
++ skb->csum_offset = offsetof(struct tcphdr, check);
++ break;
++ case IPPROTO_UDP:
++ skb->csum_offset = offsetof(struct udphdr, check);
++ break;
++ default:
++ if (net_ratelimit())
++ printk(KERN_ERR "Attempting to checksum a non-"
++ "TCP/UDP packet, dropping a protocol"
++ " %d packet", skb->nh.iph->protocol);
++ goto out;
++ }
++ if ((skb->h.raw + skb->csum_offset + 2) > skb->tail)
++ goto out;
++ skb->ip_summed = CHECKSUM_PARTIAL;
++
++ return 0;
++out:
++ return -EPROTO;
++}
++EXPORT_SYMBOL(skb_checksum_setup);
- Previous message: rpms/arm-gp2x-linux-gcc/FC-6 .cvsignore, 1.4, 1.5 arm-gp2x-linux-gcc.spec, 1.3, 1.4 sources, 1.4, 1.5
- Next message: rpms/banshee/devel .cvsignore, 1.11, 1.12 banshee.spec, 1.34, 1.35 sources, 1.11, 1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list