Renaming skb->h to skb->transport_header, skb->nh to skb->network_header and
skb->mac to skb->mac_header, to match the names of the associated helpers
(skb[_[re]set]_{transport,network,mac}_header).

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit cfe1fc7759fdacb0c650b575daed1692bf3eaece
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Fri Mar 16 17:26:39 2007 -0300

[SK_BUFF]: Introduce skb_network_header_len

For the common sequence "skb->h.raw - skb->nh.raw", similar to skb->mac_len,
that is precalculated tho, don't think we need to bloat skb with one more
member, so just use this new helper, reducing the number of non-skbuff.h
references to the layer headers even more.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

--------------------------------------------------------------

vmnet - userif.c

/*
* If truncation occurs, we do not bother with checksumming - caller cannot
* verify checksum anyway in such case, and copy without checksum it is
* faster.
*/
if (skb->pkt_type == PACKET_OUTGOING && /* Packet must be outgoing */
skb->ip_summed == VM_CHECKSUM_PARTIAL && /* Without checksum */
skb->h.raw != skb->nh.raw && /* We must know where header is */
skb->len == count) { /* No truncation may occur */
size_t skl;
int csum;
u_int16_t csum16;

skl = skb->h.raw - skb->data;
if (VNetCopyDatagram(skb, buf, skl)) {
return -EFAULT;
}

--------------------------------------------------------------------------------
vmnet - userif.c

which translates to:

/*
* If truncation occurs, we do not bother with checksumming - caller cannot
* verify checksum anyway in such case, and copy without checksum it is
* faster.
*/
if (skb->pkt_type == PACKET_OUTGOING && /* Packet must be outgoing */
skb->ip_summed == VM_CHECKSUM_PARTIAL && /* Without checksum */
skb->transport_header != skb->network_header && /* We must know where header is */
skb->len == count) { /* No truncation may occur */
size_t skl;
int csum;
u_int16_t csum16;

skl = skb->transport_header - skb->data;
if (VNetCopyDatagram(skb, buf, skl)) {
return -EFAULT;
}

------------------------------------------------------------------------------

additional files altered:

bridge.c
filter.c
vnetInt.h
smac_compact.c

those who wish to use the 2.6.21 kernel, you must patch your kernel to 2.6.22rc1. www.kernel.org - simply download the kernel 2.6.21 and download 2.6.21 RC1, then patch it.

you should have paravirtualisation enabled in your kernel, followed by the VMI. it is not required, and the vm-modules will still build. this fix applys to their vmnet. it is VERY important you patch your kernel to 2.6.22rc1 otherwise you'll get the famious GPL error if you choose to include paravirtualisation support.

download the file I have placed here into /usr/lib/vmware/modules/source/ and rerun vmware-config.pl

http://76.223.200.211:8001/vmware/vmnet.tar

my entire goal was to use paravirtualisation without the need of using a so called ''supported platform'' (ie *buntu) which is not an acceptable answer as I absolutely love ArchLinux, and like maintaining my own kernel.

I hope this will help others out there who are likeminded.

Message was edited by:
sputnik66