Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[karo-tx-linux.git] / net / openvswitch / datapath.h

diff --git a/net/openvswitch/datapath.h b/net/openvswitch/datapath.h
index 129ec548075829399e68cd8e77e8f1902a8938fc..031dfbf37c937dff57657d33d45143d454cc4e46 100644 (file)
--- a/net/openvswitch/datapath.h
+++ b/net/openvswitch/datapath.h
@@ -129,7 +129,7 @@ struct dp_upcall_info {
        u8 cmd;
        const struct sw_flow_key *key;
        const struct nlattr *userdata;
-       u32 pid;
+       u32 portid;
 };
 
 static inline struct net *ovs_dp_get_net(struct datapath *dp)