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>

1 files changed, 7 insertions, 7 deletions

diff --git a/net/phonet/pn_netlink.c b/net/phonet/pn_netlink.c
index 7dd762a464e5..83a8389619aa 100644
--- a/net/phonet/pn_netlink.c
+++ b/net/phonet/pn_netlink.c
@@ -33,7 +33,7 @@
 /* Device address handling */
 
 static int fill_addr(struct sk_buff *skb, struct net_device *dev, u8 addr,
-                     u32 pid, u32 seq, int event);
+                     u32 portid, u32 seq, int event);
 
 void phonet_address_notify(int event, struct net_device *dev, u8 addr)
 {
@@ -101,12 +101,12 @@ static int addr_doit(struct sk_buff *skb, struct nlmsghdr *nlh, void *attr)
 }
 
 static int fill_addr(struct sk_buff *skb, struct net_device *dev, u8 addr,
-                        u32 pid, u32 seq, int event)
+                        u32 portid, u32 seq, int event)
 {
         struct ifaddrmsg *ifm;
         struct nlmsghdr *nlh;
 
-        nlh = nlmsg_put(skb, pid, seq, event, sizeof(*ifm), 0);
+        nlh = nlmsg_put(skb, portid, seq, event, sizeof(*ifm), 0);
         if (nlh == NULL)
                 return -EMSGSIZE;
 
@@ -148,7 +148,7 @@ static int getaddr_dumpit(struct sk_buff *skb, struct netlink_callback *cb)
                                 continue;
 
                         if (fill_addr(skb, pnd->netdev, addr << 2,
-                                         NETLINK_CB(cb->skb).pid,
+                                         NETLINK_CB(cb->skb).portid,
                                         cb->nlh->nlmsg_seq, RTM_NEWADDR) < 0)
                                 goto out;
                 }
@@ -165,12 +165,12 @@ out:
 /* Routes handling */
 
 static int fill_route(struct sk_buff *skb, struct net_device *dev, u8 dst,
-                        u32 pid, u32 seq, int event)
+                        u32 portid, u32 seq, int event)
 {
         struct rtmsg *rtm;
         struct nlmsghdr *nlh;
 
-        nlh = nlmsg_put(skb, pid, seq, event, sizeof(*rtm), 0);
+        nlh = nlmsg_put(skb, portid, seq, event, sizeof(*rtm), 0);
         if (nlh == NULL)
                 return -EMSGSIZE;
 
@@ -276,7 +276,7 @@ static int route_dumpit(struct sk_buff *skb, struct netlink_callback *cb)
 
                 if (addr_idx++ < addr_start_idx)
                         continue;
-                if (fill_route(skb, dev, addr << 2, NETLINK_CB(cb->skb).pid,
+                if (fill_route(skb, dev, addr << 2, NETLINK_CB(cb->skb).portid,
                                 cb->nlh->nlmsg_seq, RTM_NEWROUTE))
                         goto out;
         }