gmane.network.openvswitch.devel

[PATCH] ofproto/ofproto-dpif.c: Fix a typo in functionheader

Alex Wang — 2013-05-19T04:33:25

There is a typo in the "bundle_add_port()" function header.

This patch fixes it.

Signed-off-by: Alex Wang <alexw-l0M0P4e3n4LQT0dZR+AlfA< at >public.gmane.org>
---
 ofproto/ofproto-dpif.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index c4f7d25..5cc56d1 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
< at >< at > -2472,7 +2472,7 < at >< at > bundle_del_port(struct ofport_dpif *port)
 }
 
 static bool
-bundle_add_port(struct ofbundle *bundle, uint32_t ofp_port,
+bundle_add_port(struct ofbundle *bundle, uint16_t ofp_port,
                 struct lacp_slave_settings *lacp)
 {
     struct ofport_dpif *port;

[PATCH] netdev-dummy: Remove FreeBSD dependency.

Ben Pfaff — 2013-05-17T22:57:20

There's no particular reason that netdev_dummy_register() has to care about
the particular OS, except that the tests like to use the special Linux-only
tunnel vport types.  But that can be done better, I think, by just always
registering them from netdev_dummy_register() and making that function
idempotent, so that calling it twice under Linux has no additional effect.
This commit implements that solution.

CC: Ed Maste <emaste-h+KGxgPPiopAfugRpC6u6w< at >public.gmane.org>
Signed-off-by: Ben Pfaff <blp-l0M0P4e3n4LQT0dZR+AlfA< at >public.gmane.org>
---
 lib/netdev-dummy.c |   10 +---------
 lib/netdev-vport.c |    8 ++++++--
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c
index 908fef2..14b286b 100644
--- a/lib/netdev-dummy.c
+++ b/lib/netdev-dummy.c
< at >< at > -36,12 +36,6 < at >< at >
 
 VLOG_DEFINE_THIS_MODULE(netdev_dummy);
 
-#ifdef __FreeBSD__
-#define FREE_BSD 1
-#else
-#define FREE_BSD 0
-#endif
-
 struct netdev_dummy {
     struct netdev up;
     uint8_t hwaddr[ETH_ADDR_L

[oftest v3 0/5] add support for OFTest

Ben Pfaff — 2013-05-17T22:23:45

This is the latest version of the oftest series.  The first version
was posted Oct. 25, 2012.  The second version was posted Feb. 1, 2013.
The only difference between v2 and v3 is considerable work rebasing
due to the restructuring of the netdev library interface.

Ben Pfaff (5):
  netdev-dummy: Limit receive queue length to 100 packets.
  netdev-dummy: Factor some netdev_dummy_receive() code out into new
    function.
  netdev-dummy: Drop "nobody listened" reply from netdev-dummy/receive.
  netdev-dummy: Add "pstream" option for connecting a dummy to a
    process.
  tests: Add support for running OFTest.

 Makefile.am           |    1 +
 NEWS                  |    2 +
 README-OFTest         |   77 ++++++++++++++
 lib/netdev-dummy.c    |  267 +++++++++++++++++++++++++++++++++++++++++++++---
 tests/automake.mk     |    6 +
 tests/ofproto-dpif.at |   24 ++---
 tests/run-oftest      |   94 +++++++++++++++++
 7 files changed, 438 insertions(+), 33 deletions(-)
 create mode 100644 README-OFTest
 create mode 1007

[PATCH v3] bridge: Fix use of wild pointer iniface_do_create().

Ben Pfaff — 2013-05-17T05:45:43

'netdev' was not initialized at this point in the function, so the cleanup
at the error label referenced a wild pointer.

Introduced in commit 94a538422d4b (netdev: Prevent using reserved names).

CC: Alex Wang <alexw-l0M0P4e3n4LQT0dZR+AlfA< at >public.gmane.org>
Signed-off-by: Ben Pfaff <blp-l0M0P4e3n4LQT0dZR+AlfA< at >public.gmane.org>
---
v1->v2: Fix Alex's email address.
v2->v3: Fix bug I introduced noted by Justin.

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 28e306e..e10036c 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
< at >< at > -1415,7 +1415,7 < at >< at > iface_do_create(const struct bridge *br,
 {
     const struct ovsrec_interface *iface_cfg = if_cfg->cfg;
     const struct ovsrec_port *port_cfg = if_cfg->parent;
-    struct netdev *netdev;
+    struct netdev *netdev = NULL;
     int error;
 
     if (netdev_is_reserved_name(iface_cfg->name)) {

[PATCH v2] bridge: Fix use of wild pointer iniface_do_create().

Ben Pfaff — 2013-05-17T05:30:11

'netdev' is not initialized at this point in the function, so the cleanup
at the error label references a wild pointer (and is not useful anyhow).

Introduced in commit 94a538422d4b (netdev: Prevent using reserved names).

CC: Alex Wang <alexw-l0M0P4e3n4LQT0dZR+AlfA< at >public.gmane.org>
Signed-off-by: Ben Pfaff <blp-l0M0P4e3n4LQT0dZR+AlfA< at >public.gmane.org>
---
v1->v2: Fix Alex's email address.

 vswitchd/bridge.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 28e306e..71aae15 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
< at >< at > -1421,8 +1421,7 < at >< at > iface_do_create(const struct bridge *br,
     if (netdev_is_reserved_name(iface_cfg->name)) {
         VLOG_WARN("could not create interface %s, name is reserved",
                   iface_cfg->name);
-        error = EINVAL;
-        goto error;
+        return EINVAL;
     }
 
     error = netdev_open(iface_cfg->name,

[PATCH] bridge: Fix use of wild pointer iniface_do_create().

Ben Pfaff — 2013-05-17T05:29:01

'netdev' is not initialized at this point in the function, so the cleanup
at the error label references a wild pointer (and is not useful anyhow).

Introduced in commit 94a538422d4b (netdev: Prevent using reserved names).

CC: Alex Wang <awang-l0M0P4e3n4LQT0dZR+AlfA< at >public.gmane.org>
Signed-off-by: Ben Pfaff <blp-l0M0P4e3n4LQT0dZR+AlfA< at >public.gmane.org>
---
 vswitchd/bridge.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 28e306e..71aae15 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
< at >< at > -1421,8 +1421,7 < at >< at > iface_do_create(const struct bridge *br,
     if (netdev_is_reserved_name(iface_cfg->name)) {
         VLOG_WARN("could not create interface %s, name is reserved",
                   iface_cfg->name);
-        error = EINVAL;
-        goto error;
+        return EINVAL;
     }
 
     error = netdev_open(iface_cfg->name,

[PATCH v2 0/2] Enhancements to formatting of PACKET_{IN,OUT} messages

Simon Horman — 2013-05-17T05:14:12

Hi,

This short series includes two enhancements to the formatting
of PACKET_{IN,OUT} messages. They are explained more fully
in their individual changelogs.

The second patch has a run-time dependency on the first patch.

Simon Horman (2):
  ofp-print: ofp_packet_to_string() Do not emit extra trailing newline
  Allow hexdump of packet data of PACKET_{IN,OUT} messages

 lib/ofp-print.c    |   7 ++-
 tests/ofp-print.at | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 134 insertions(+), 1 deletion(-)

[PATCH 0/2] Enhancements to formatting of PACKET_{IN,OUT} messages

Simon Horman — 2013-05-17T03:26:24

Hi,

This short series includes two enhancements to the formatting
of PACKET_{IN,OUT} messages. They are explained more fully
in their individual changelogs.

The second patch has a run-time dependency on the first patch.

Simon Horman (2):
  ofp-print: ofp_packet_to_string() Do not emit extra trailing newline
  Allow hexdump of packet data of PACKET_{IN,OUT} messages

 lib/ofp-print.c    |   9 +++-
 tests/ofp-print.at | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 135 insertions(+), 2 deletions(-)

[PATCH] lib/mac-learning.h: Change one variable's typeand name

Alex Wang — 2013-05-16T22:17:10

This commit changes variable "int i" of "union port" of "struct mac_entry"
to "uint16_t ofp_port", since it is used to store the OpenFlow port number.

Signed-off-by: Alex Wang <alexw-l0M0P4e3n4LQT0dZR+AlfA< at >public.gmane.org>
---
 lib/learning-switch.c |    6 +++---
 lib/mac-learning.h    |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/learning-switch.c b/lib/learning-switch.c
index 4a95dc1..ab37dcc 100644
--- a/lib/learning-switch.c
+++ b/lib/learning-switch.c
< at >< at > -474,12 +474,12 < at >< at > lswitch_choose_destination(struct lswitch *sw, const struct flow *flow)
     /* Learn the source MAC. */
     if (mac_learning_may_learn(sw->ml, flow->dl_src, 0)) {
         struct mac_entry *mac = mac_learning_insert(sw->ml, flow->dl_src, 0);
-        if (mac_entry_is_new(mac) || mac->port.i != flow->in_port) {
+        if (mac_entry_is_new(mac) || mac->port.ofp_port != flow->in_port) {
             VLOG_DBG_RL(&rl, "%016llx: learned that "ETH_ADDR_FMT" is on "
                         "port %"PRIu16

[PATCH] netdev: Prevent using reserved names

Alex Wang — 2013-05-16T21:11:51

This commit adds a function to lib/netdev.c to check that the interface name
is not the same as any of the registered vport providers' dpif_port name
(e.g. gre_system) or the datapath's internal port name (e.g. ovs-system).

Bug #15077

Signed-off-by: Alex Wang <alexw-l0M0P4e3n4LQT0dZR+AlfA< at >public.gmane.org>
---
 lib/netdev-vport.c |   11 +++++++---
 lib/netdev-vport.h |    3 ++-
 lib/netdev.c       |   38 ++++++++++++++++++++++++++++++++
 lib/netdev.h       |    1 +
 tests/ovs-vsctl.at |   62 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 vswitchd/bridge.c  |    7 ++++++
 6 files changed, 118 insertions(+), 4 deletions(-)

diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index 699ed71..a5bf79d 100644
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
< at >< at > -115,6 +115,13 < at >< at > netdev_vport_needs_dst_port(const struct netdev *dev)
 }
 
 const char *
+netdev_vport_class_get_dpif_port(const struct netdev_class *class)
+{
+    return is_vport_class(class)
+              ? vport_class_cast(class)->dpif_port

Ugente Doação para a Obra de Deus da Sra. Rania Hassan.

Sra. Rania Hassan — 2013-05-16T18:44:22



De Rania Hassan
N ° 38 rue des Martyrs Cocody
Abidjan, Costa do Marfim.

Querida DE DEUS,

Saudações no poderoso nome de nosso Senhor Jesus Cristo, eu sei que Deus
vai conceder-lhe a vontade e interesse para digerir esta narração humilde
que ele possa ser tão estranho para você acreditar na minha história, mas
eu sei que pelo raciocínio e sabedoria do Todo-Poderoso Deus que criou o
céu ea terra, você vai entender e aceitar humildemente a prosseguir com a
minha proposta, ainda que nós não nos conhecemos uns aos outros ou visto
antes, mas eu sei que a distância não vai ser uma barreira para essa
missão divina.

Antes de prosseguir, deixe-me apresentar-me a você, meu nome é Irmã Rania
Hassan uma viúva de falecido Sr. Amed Hassan que era um homem de negócios
competente aqui em Abidjan Costa do Marfim, estávamos casados há muitos
anos sem filhos até sua morte em outubro de 2008 após uma breve doença,
devido à promessa que eu reverenciava a ele no altar no dia do nosso
casamento na ig

[PATCH 1/2] dynamic-string: Fix style ofds_put_hex_dump().

Ben Pfaff — 2013-05-16T05:36:06

Signed-off-by: Ben Pfaff <blp-l0M0P4e3n4LQT0dZR+AlfA< at >public.gmane.org>
---
 lib/dynamic-string.c |   78 +++++++++++++++++++++++++-------------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/lib/dynamic-string.c b/lib/dynamic-string.c
index ba9aa6d..b35fd0b 100644
--- a/lib/dynamic-string.c
+++ b/lib/dynamic-string.c
< at >< at > -358,48 +358,48 < at >< at > void
 ds_put_hex_dump(struct ds *ds, const void *buf_, size_t size,
                 uintptr_t ofs, bool ascii)
 {
-  const uint8_t *buf = buf_;
-  const size_t per_line = 16; /* Maximum bytes per line. */
-
-  while (size > 0)
-    {
-      size_t start, end, n;
-      size_t i;
-
-      /* Number of bytes on this line. */
-      start = ofs % per_line;
-      end = per_line;
-      if (end - start > size)
-        end = start + size;
-      n = end - start;
-
-      /* Print line. */
-      ds_put_format(ds, "%08jx  ", (uintmax_t) ROUND_DOWN(ofs, per_line));
-      for (i = 0; i < start; i++)
-        ds_put_format(ds, "   ");
-      for (; i

[PATCH] netdev: Prevent using reserved names

Alex Wang — 2013-05-15T21:33:57

This commit adds a function to lib/netdev.c to check that the interface name
is not the same as any of the registered vport providers' dpif_port name
(e.g. gre_system) or the datapath's internal port name (e.g. ovs-system).

Bug #15077

Signed-off-by: Alex Wang <alexw-l0M0P4e3n4LQT0dZR+AlfA< at >public.gmane.org>
---
 lib/netdev-vport.c |   15 ++++++++++---
 lib/netdev-vport.h |    3 ++-
 lib/netdev.c       |   37 +++++++++++++++++++++++++++++++
 lib/netdev.h       |    1 +
 tests/ovs-vsctl.at |   62 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 vswitchd/bridge.c  |    7 ++++++
 6 files changed, 121 insertions(+), 4 deletions(-)

diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index 699ed71..31daafc 100644
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
< at >< at > -115,6 +115,17 < at >< at > netdev_vport_needs_dst_port(const struct netdev *dev)
 }
 
 const char *
+netdev_vport_class_get_dpif_port(const struct netdev_class *class)
+{
+    const char *dpif_port;
+
+    dpif_port = (is_vport_class(class)
+

[PATCH] tests/ovs-vsctl.at: Delete trailing white spaces

Alex Wang — 2013-05-15T21:33:04

Found out there are some trailing white spaces. This patch fixes it.

Signed-off-by: Alex Wang <alexw-l0M0P4e3n4LQT0dZR+AlfA< at >public.gmane.org>
---
 tests/ovs-vsctl.at |   86 ++++++++++++++++++++++++++--------------------------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at
index 439bd2d..56d9bae 100644
--- a/tests/ovs-vsctl.at
+++ b/tests/ovs-vsctl.at
< at >< at > -73,7 +73,7 < at >< at > m4_define([CHECK_BRIDGES],
 
    dnl Check that each bridge exists according to br-exists and that
    dnl a bridge that should not exist does not.
-   m4_foreach([brinfo], [$< at >], 
+   m4_foreach([brinfo], [$< at >],
               [AT_CHECK([RUN_OVS_VSCTL([br-exists m4_car(brinfo)])], [0], [],
                         [], [OVS_VSCTL_CLEANUP])])
    AT_CHECK([RUN_OVS_VSCTL([br-exists nonexistent])], [2], [], [],
< at >< at > -111,7 +111,7 < at >< at > m4_define([CHECK_PORTS],
 ],
             [OVS_VSCTL_CLEANUP])
    m4_foreach(
-     [port], m4_cdr($< at >), 
+     [port], m4_cdr($< at >),
      [AT_CHECK([RUN_OVS_VSCTL(

[PATCH] port naming: prevent using reserved names

Alex Wang — 2013-05-15T16:38:34

This commit adds function in lib/netdev.c to check that the interface name
is not the same as any of the registered vport providers' dpif_port name
(e.g. gre_system) or the datapath's internal port name (e.g. ovs-system).

This function is called in iface_do_create() function in vswitchd/bridge.c.
If there is a name conflict, no interface and of_port will be created. And
the warning will be given in the ovs-vswitchd.log

Signed-off-by: Alex Wang <alexw-l0M0P4e3n4LQT0dZR+AlfA< at >public.gmane.org>
---
 lib/netdev-vport.c |   15 ++++++++++---
 lib/netdev-vport.h |    3 ++-
 lib/netdev.c       |   41 ++++++++++++++++++++++++++++++++++
 lib/netdev.h       |    1 +
 tests/ovs-vsctl.at |   62 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 vswitchd/bridge.c  |    5 +++++
 6 files changed, 123 insertions(+), 4 deletions(-)

diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index 699ed71..d63c6c7 100644
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
< at >< at > -115,6 +115,17 < at >< at > netdev_vport_needs_dst_port(const stru

[PATCH] Allow multiple levels of MPLS push and pop

Simon Horman — 2013-05-15T08:50:29

Also:
* Remove mpls_depth from struct flow,
  This value really has not place in the flow which otherwise
  only knows about the top-most LSE.
  Instead track depth changes during execution.
* Allow MPLS pop to MPLS. That is, poping the top-most LSE of
  an MPLS stack of depth greater than one.

This patch relies on recirculation to update packets to allow
combinations of push and pop actions using a flow which only
knows about the top-most LSE.

Signed-off-by: Simon Horman <horms+renesas-/R6kz+dDXgpPR4JQBCEnsQ< at >public.gmane.org>
---
 lib/flow.c               |   6 +-
 lib/flow.h               |   9 +-
 lib/match.c              |   2 +-
 lib/nx-match.c           |   2 +-
 lib/odp-util.c           |  49 +++---
 lib/odp-util.h           |   1 +
 lib/ofp-actions.c        |   6 -
 lib/ofp-util.c           |   5 +-
 lib/packets.c            |  33 +---
 lib/packets.h            |   2 -
 ofproto/ofproto-dpif.c   | 151 +++++++++++++----
 tests/ofproto-dpif.at    | 413 +++++++++++++++++++++++++++++++++++++++++++++++

[PATCH v8 0/5] Add packet recirculation

Simon Horman — 2013-05-15T08:31:39

Recirculation is a technique to allow a frame to re-enter
frame processing. This is intended to be used after actions
have been applied to the frame with modify the frame in
some way that makes it possible for richer processing to occur.

An example is and indeed targeted use case is MPLS. If an MPLS frame has an
mpls_pop action applied with the IPv4 ethernet type then it becomes
possible to decode the IPv4 portion of the frame. This may be used to
construct a facet that modifies the IPv4 portion of the frame. This is not
possible prior to the mpls_pop action as the contents of the frame after
the MPLS stack is not known to be IPv4.


Design:

* New recirculation action.

  ovs-vswitchd adds a recirculation action to the end of a list of
  datapath actions for a flow when the actions are truncated because
  insufficient flow match information is available to add the next
  OpenFlow action.  The recirculation action is preceded by an action
  to set the skb_mark to an id which can be used to scope a facet loo

[PATCH RFC 0/2] Allow monitor to output a hexdump ofPACKET_IN packets

Simon Horman — 2013-05-15T08:10:47

Hi this short series aims to provide a mechanism for ovs-ofctl -m monitor
to output the hex of the packet data of a PACKET_IN message. This is
aimed at testing MPLS more thoroughly. A more detailed explanation
is included in the change log of the last patch of the series.

Simon Horman (2):
  Do not include trailing whitespace in hexdump
  Allow monitor to output a hexdump of PACKET_IN packets

 lib/dynamic-string.c | 10 +++++++---
 lib/ofp-print.c      |  3 +++
 2 files changed, 10 insertions(+), 3 deletions(-)

[PATCH] Release Open vSwitch 1.10.1.

Justin Pettit — 2013-05-15T05:25:30

Signed-off-by: Justin Pettit <jpettit-l0M0P4e3n4LQT0dZR+AlfA< at >public.gmane.org>
---
 NEWS             |    5 +++++
 configure.ac     |    2 +-
 debian/changelog |    7 +++++++
 3 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index e62d5e3..b9805e6 100644
--- a/NEWS
+++ b/NEWS
< at >< at > -1,3 +1,8 < at >< at >
+v1.10.1 - 14 May 2013
+---------------------
+    - Bug fixes
+
+
 v1.10.0 - 01 May 2013
 ---------------------
     - Bridge compatibility support has been removed.  Any uses that
diff --git a/configure.ac b/configure.ac
index eabbd0b..54bdb05 100644
--- a/configure.ac
+++ b/configure.ac
< at >< at > -13,7 +13,7 < at >< at >
 # limitations under the License.
 
 AC_PREREQ(2.64)
-AC_INIT(openvswitch, 1.10.0, ovs-bugs-yBygre7rU0TnMu66kgdUjQ< at >public.gmane.org)
+AC_INIT(openvswitch, 1.10.1, ovs-bugs-yBygre7rU0TnMu66kgdUjQ< at >public.gmane.org)
 AC_CONFIG_SRCDIR([datapath/datapath.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
diff --git a/debian/changelog b/debian/changelog
index 7711144..adccec8 100644
--

[xlate 1/4] ofpbuf: New helper ofpbuf_equal().

Ethan Jackson — 2013-05-15T02:29:33

Used in future commits.

Signed-off-by: Ethan Jackson <ethan-l0M0P4e3n4LQT0dZR+AlfA< at >public.gmane.org>
---
 lib/ofpbuf.h |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/ofpbuf.h b/lib/ofpbuf.h
index 8b03c7e..0c12162 100644
--- a/lib/ofpbuf.h
+++ b/lib/ofpbuf.h
< at >< at > -107,6 +107,12 < at >< at > static inline struct ofpbuf *ofpbuf_from_list(const struct list *list)
 }
 void ofpbuf_list_delete(struct list *);
 
+static inline bool
+ofpbuf_equal(const struct ofpbuf *a, const struct ofpbuf *b)
+{
+    return a->size == b->size && memcmp(a->data, b->data, a->size) == 0;
+}
+
 #ifdef  __cplusplus
 }
 #endif

[PATCH v2] datapath: Fix compilation with Linux kernel3.7.

Pravin B Shelar — 2013-05-13T22:38:05

Definition of __sum16 and __wsum is moved to uapi header.
Following patch adds check in config script for second possible
header.

Signed-off-by: Pravin B Shelar <pshelar-l0M0P4e3n4LQT0dZR+AlfA< at >public.gmane.org>
---
 acinclude.m4 |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 34634a2..cc45a3a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
< at >< at > -264,6 +264,8 < at >< at > AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
                   [OVS_DEFINE([HAVE_BOOL_TYPE])])
   OVS_GREP_IFELSE([$KSRC/include/linux/types.h], [__wsum],
                   [OVS_DEFINE([HAVE_CSUM_TYPES])])
+  OVS_GREP_IFELSE([$KSRC/include/uapi/linux/types.h], [__wsum],
+                  [OVS_DEFINE([HAVE_CSUM_TYPES])])
 
   OVS_GREP_IFELSE([$KSRC/include/net/checksum.h], [csum_replace4])
   OVS_GREP_IFELSE([$KSRC/include/net/checksum.h], [csum_unfold])