[ovs-git] Open vSwitch: datapath: Fix warning building datapath on pre-2.6.24 kernels. (master)

dev at openvswitch.org dev at openvswitch.org
Wed Nov 18 23:57:26 UTC 2009

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Open vSwitch".

The branch, master has been updated
       via  e8cf6733e490cf78c1e5f5f58c3655011fb8ae22 (commit)
       via  6a33828dbcc9a4f67bd730061b931c77caad2990 (commit)
      from  d17ee8689bff22541dccaa792b70a848641f3646 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e8cf6733e490cf78c1e5f5f58c3655011fb8ae22
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=e8cf6733e490cf78c1e5f5f58c3655011fb8ae22
Author: Ben Pfaff <blp at nicira.com>
datapath: Fix warning building datapath on pre-2.6.24 kernels.
The Linux 'min' macro checks that its arguments have the same type, and
if not the compiler reports a message about incompatible pointer types.
On pre-2.6.24 kernels skb_headroom() returns int, so this code was
firing a warning:
       unsigned headroom = max(min_headroom, skb_headroom(skb));

This commit makes skb_headroom() return an unsigned int regardless of
kernel version.

commit 6a33828dbcc9a4f67bd730061b931c77caad2990
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=6a33828dbcc9a4f67bd730061b931c77caad2990
Author: Ben Pfaff <blp at nicira.com>
datapath: Check for proto_data_valid member instead of kernel version.
Commit 5ef800a69 "datapath: Copy Xen's checksumming fields when doing
skb_copy" should copy proto_data_valid between sk_buffs when that field
is present.  However the check for CONFIG_XEN plus kernel version 2.6.18
isn't sufficient, because SLES 11 kernels are version 2.6.27 but do have
this field.

This commit adds a configure-time check for the presence of the member
instead of attempting to guess based on the kernel version.

Thanks to Ian Campbell for reporting this problem.

CC: <Ian.Campbell at citrix.com>


Summary of changes:
 acinclude.m4                                       |    7 +++++++
 datapath/actions.c                                 |    2 +-
 .../linux-2.6/compat-2.6/include/linux/skbuff.h    |   11 +++++++++++
 3 files changed, 19 insertions(+), 1 deletions(-)

Open vSwitch

More information about the git mailing list