~xnox/ubuntu-z-systems/+git/ovs:xs5.7

Last commit made on 2009-12-17
Get this branch:
git clone -b xs5.7 https://git.launchpad.net/~xnox/ubuntu-z-systems/+git/ovs

Branch merges

Branch information

Name:
xs5.7
Repository:
lp:~xnox/ubuntu-z-systems/+git/ovs

Recent commits

d1c8c9e... by Ian Campbell <email address hidden>

initscript: pass complete path to pidfile to status command

Older versions of RHEL/CentOS used pifof in preference to the pidfile
and hence we got away with passing just the basename instead of
including the full path. Using pidof first doesn't make much sense and
this was fixed in RHEL 5 update 4 (see https://bugzilla.redhat.com/show_bug.cgi?id=440658)

This means that on RHEL 5.4 "service vswitch status" always returned
"ovs-vswitchd is stopped" even if it was running. Fix this issue by
passing in the correct pidfile name.

Signed-off-by: Ian Campbell <email address hidden>

dac3c52... by Ben Pfaff

Merge master branch into xs5.7.

Conflicts:
 xenserver/README
 xenserver/automake.mk
 xenserver/etc_xensource_scripts_vif
 xenserver/usr_share_vswitch_scripts_dump-vif-details
 xenserver/vswitch-xen.spec

d17ee86... by Ben Pfaff

Merge citrix branch into master.

0cd8a05... by Jesse Gross

datapath: Allow minimum headroom to be set when copying buffers.

If we need to copy an sk_buff in order to make it writable, allow
the minimum headroom to be specified. This ensures that if we
need to add additional data, such as a VLAN tag, we will not have
to make a second copy.

Solves bug #2197 in certain situations.

5ef800a... by Jesse Gross

datapath: Copy Xen's checksumming fields when doing skb_copy.

Two fields that control checksumming were added to sk_buff in
Xen: proto_data_valid and proto_csum_blank. These fields are copied
when doing a skb_clone but not in other functions such as skb_copy,
which can lead to checksum errors in TCP and UDP when offloading is
enabled in the guest. To fix this we manually copy these fields,
though ideally this should be fixed upstream in Xen.

Bug #2299

7c9e113... by Ben Pfaff

datapath: Fix build with kernel header layout recently adopted by Debian.

Recent Debian kernel-header packages divide kernel headers into two
directories: the "common" headers that are not architecture-specific,
which go in a directory named like
    /usr/src/kernel-headers-2.6.31-1-common,
and architecture-specific headers in a directory named, e.g.
    /usr/src/kernel-headers-2.6.31-1-686.
OVS needs to look at the ones in the "common" directory as part of its
configuration process, but the build directory provided on --with-l26 is
the architecture-specific directory. We also need the
architecture-specific directory, since it is the one that we use as part
of the "make", so we can't simply make the user specify the common
directory on --with-l26. Furthermore, there is no easy-to-see link
between the two directories, except as part of the text in a Makefile,
which is not the easiest language to parse.

This commit attempts to kluge around the problem by using the Debian
directory naming. If the build directory does not contain the headers,
then we replace the last component of its name by "-common" and check
for the headers there. This is not ideal, but it does solve the actual
problem at hand.

Tested with Debian's linux-headers-2.6.31-1-686 and with a few older
sets of headers that do not use this scheme.

d377243... by Ben Pfaff

Document userspace switch.

37c9895... by Ben Pfaff

Update documentation to mention correct Autoconf version prerequisite.

460d806... by Justin Pettit

datapath: Remove unused print_flow() function

de3f65e... by Justin Pettit

datapath: Cleanup tab/space issues in datapath