diff --git a/[refs] b/[refs]
index 57efb4ea19ae..6cac0bd9c9f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03599c94111bdac92fb5a70d592f5382b6fda75f
+refs/heads/master: 9807a54cd74149988f5d20088bf7a7957c205bfb
diff --git a/trunk/include/linux/openvswitch.h b/trunk/include/linux/openvswitch.h
index d42e174bd0c8..99e6414a40d9 100644
--- a/trunk/include/linux/openvswitch.h
+++ b/trunk/include/linux/openvswitch.h
@@ -94,7 +94,7 @@ struct ovs_vport_stats {
 };
 
 /* Fixed logical ports. */
-#define OVSP_LOCAL      ((__u16)0)
+#define OVSP_LOCAL      ((__u32)0)
 
 /* Packet transfer. */