[ovs-dev] [PATCH v2 0/2] Make <linux/openvswitch.h> better from userspace

Ben Pfaff blp at nicira.com
Sat Aug 2 04:36:51 UTC 2014


The <linux/openvswitch.h> header is confusing from userspace, because it
needs to be included on all our platforms yet it has to match upstream
Linux with all of the baggage that carries.  This series tries to improve
on the situation.

v1->v2: Drop first patch because it has been committed.  Change strategy
  from modifying the Linux-specific header as part of the repo, to
  transforming it at build time with a "sed" script.

Ben Pfaff (2):
  Do not seemingly #include Linux-specific headers on other platforms.
  odp-netlink.h: Use 32-bit aligned 64-bit types.

 Makefile.am                                        |  1 +
 build-aux/extract-odp-netlink-h                    | 32 ++++++++++++
 datapath/linux/Modules.mk                          |  1 +
 .../linux/compat/include}/linux/openvswitch.h      |  0
 debian/copyright.in                                |  2 +-
 include/automake.mk                                |  9 +++-
 include/linux/automake.mk                          |  4 --
 include/linux/if_ether.h                           | 31 ------------
 include/linux/types.h                              | 58 ----------------------
 include/openvswitch/types.h                        | 15 ++----
 lib/dpif-linux.c                                   | 43 ++++++++--------
 lib/dpif-linux.h                                   |  4 +-
 lib/dpif.h                                         |  7 ++-
 lib/netdev-linux.c                                 | 32 ++++++------
 lib/odp-execute.c                                  |  2 +-
 lib/odp-util.h                                     |  2 +-
 16 files changed, 94 insertions(+), 149 deletions(-)
 create mode 100755 build-aux/extract-odp-netlink-h
 rename {include => datapath/linux/compat/include}/linux/openvswitch.h (100%)
 delete mode 100644 include/linux/automake.mk
 delete mode 100644 include/linux/if_ether.h
 delete mode 100644 include/linux/types.h

-- 
1.9.1




More information about the dev mailing list