diff options
| author | Ben Pfaff <blp@nicira.com> | 2009-10-22 17:43:28 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2009-10-22 17:43:28 -0700 |
| commit | 3f355f47f8e7343e909ccfa854454d667baf3c38 (patch) | |
| tree | 21898eaab13a44cf3dadac0ff468a2f08d7df46a /acinclude.m4 | |
| parent | adea354e28134f08008732062ef0c613954dc7e4 (diff) | |
| parent | 2416b8eceae7b2508fe72efbc17d9cb71b69d330 (diff) | |
Merge "citrix" into "master".
This merge took a little bit of care due to two issues:
- Crossport of "interface-reconfigure" fixes from master back to
citrix that had happened and needed to be canceled out of the merge.
- New script "refresh-xs-network-uuids" added on citrix branch that
needed to be moved from /root/vswitch/scripts to
/usr/share/vswitch/scripts.
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 2f38997f..6ba647ab 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -119,6 +119,10 @@ AC_DEFUN([OVS_CHECK_LINUX26_COMPAT], [ [OVS_DEFINE([HAVE_NLA_NUL_STRING])]) OVS_GREP_IFELSE([$KSRC26/include/linux/err.h], [ERR_CAST], [OVS_DEFINE([HAVE_ERR_CAST])]) + OVS_GREP_IFELSE([$KSRC26/include/net/checksum.h], [csum_unfold], + [OVS_DEFINE([HAVE_CSUM_UNFOLD])]) + OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [skb_cow], + [OVS_DEFINE([HAVE_SKB_COW])]) OVS_CHECK_LOG2_H OVS_CHECK_VETH if cmp -s datapath/linux-2.6/kcompat.h.new \ |