diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2012-09-07 16:12:54 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-09-10 15:30:41 -0400 |
commit | 15e473046cb6e5d18a4d0057e61d76315230382b (patch) | |
tree | 893d2df5d46a6ce156933ac57a1398f0ad22b889 /net/openvswitch/vport.h | |
parent | 9f00d9776bc5beb92e8bfc884a7e96ddc5589e2e (diff) |
netlink: Rename pid to portid to avoid confusion
It is a frequent mistake to confuse the netlink port identifier with a
process identifier. Try to reduce this confusion by renaming fields
that hold port identifiers portid instead of pid.
I have carefully avoided changing the structures exported to
userspace to avoid changing the userspace API.
I have successfully built an allyesconfig kernel with this change.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/vport.h')
-rw-r--r-- | net/openvswitch/vport.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h index c56e4836e93b..3f7961ea3c56 100644 --- a/net/openvswitch/vport.h +++ b/net/openvswitch/vport.h | |||
@@ -70,7 +70,7 @@ struct vport_err_stats { | |||
70 | * @rcu: RCU callback head for deferred destruction. | 70 | * @rcu: RCU callback head for deferred destruction. |
71 | * @port_no: Index into @dp's @ports array. | 71 | * @port_no: Index into @dp's @ports array. |
72 | * @dp: Datapath to which this port belongs. | 72 | * @dp: Datapath to which this port belongs. |
73 | * @upcall_pid: The Netlink port to use for packets received on this port that | 73 | * @upcall_portid: The Netlink port to use for packets received on this port that |
74 | * miss the flow table. | 74 | * miss the flow table. |
75 | * @hash_node: Element in @dev_table hash table in vport.c. | 75 | * @hash_node: Element in @dev_table hash table in vport.c. |
76 | * @dp_hash_node: Element in @datapath->ports hash table in datapath.c. | 76 | * @dp_hash_node: Element in @datapath->ports hash table in datapath.c. |
@@ -83,7 +83,7 @@ struct vport { | |||
83 | struct rcu_head rcu; | 83 | struct rcu_head rcu; |
84 | u16 port_no; | 84 | u16 port_no; |
85 | struct datapath *dp; | 85 | struct datapath *dp; |
86 | u32 upcall_pid; | 86 | u32 upcall_portid; |
87 | 87 | ||
88 | struct hlist_node hash_node; | 88 | struct hlist_node hash_node; |
89 | struct hlist_node dp_hash_node; | 89 | struct hlist_node dp_hash_node; |
@@ -113,7 +113,7 @@ struct vport_parms { | |||
113 | /* For ovs_vport_alloc(). */ | 113 | /* For ovs_vport_alloc(). */ |
114 | struct datapath *dp; | 114 | struct datapath *dp; |
115 | u16 port_no; | 115 | u16 port_no; |
116 | u32 upcall_pid; | 116 | u32 upcall_portid; |
117 | }; | 117 | }; |
118 | 118 | ||
119 | /** | 119 | /** |