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, 16 insertions, 16 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 572cb660837b..1237d5d037d8 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -3534,12 +3534,12 @@ static inline int inet6_ifaddr_msgsize(void)
 }
 
 static int inet6_fill_ifaddr(struct sk_buff *skb, struct inet6_ifaddr *ifa,
-                             u32 pid, u32 seq, int event, unsigned int flags)
+                             u32 portid, u32 seq, int event, unsigned int flags)
 {
         struct nlmsghdr  *nlh;
         u32 preferred, valid;
 
-        nlh = nlmsg_put(skb, pid, seq, event, sizeof(struct ifaddrmsg), flags);
+        nlh = nlmsg_put(skb, portid, seq, event, sizeof(struct ifaddrmsg), flags);
         if (nlh == NULL)
                 return -EMSGSIZE;
 
@@ -3577,7 +3577,7 @@ static int inet6_fill_ifaddr(struct sk_buff *skb, struct inet6_ifaddr *ifa,
 }
 
 static int inet6_fill_ifmcaddr(struct sk_buff *skb, struct ifmcaddr6 *ifmca,
-                                u32 pid, u32 seq, int event, u16 flags)
+                                u32 portid, u32 seq, int event, u16 flags)
 {
         struct nlmsghdr  *nlh;
         u8 scope = RT_SCOPE_UNIVERSE;
@@ -3586,7 +3586,7 @@ static int inet6_fill_ifmcaddr(struct sk_buff *skb, struct ifmcaddr6 *ifmca,
         if (ipv6_addr_scope(&ifmca->mca_addr) & IFA_SITE)
                 scope = RT_SCOPE_SITE;
 
-        nlh = nlmsg_put(skb, pid, seq, event, sizeof(struct ifaddrmsg), flags);
+        nlh = nlmsg_put(skb, portid, seq, event, sizeof(struct ifaddrmsg), flags);
         if (nlh == NULL)
                 return -EMSGSIZE;
 
@@ -3602,7 +3602,7 @@ static int inet6_fill_ifmcaddr(struct sk_buff *skb, struct ifmcaddr6 *ifmca,
 }
 
 static int inet6_fill_ifacaddr(struct sk_buff *skb, struct ifacaddr6 *ifaca,
-                                u32 pid, u32 seq, int event, unsigned int flags)
+                                u32 portid, u32 seq, int event, unsigned int flags)
 {
         struct nlmsghdr  *nlh;
         u8 scope = RT_SCOPE_UNIVERSE;
@@ -3611,7 +3611,7 @@ static int inet6_fill_ifacaddr(struct sk_buff *skb, struct ifacaddr6 *ifaca,
         if (ipv6_addr_scope(&ifaca->aca_addr) & IFA_SITE)
                 scope = RT_SCOPE_SITE;
 
-        nlh = nlmsg_put(skb, pid, seq, event, sizeof(struct ifaddrmsg), flags);
+        nlh = nlmsg_put(skb, portid, seq, event, sizeof(struct ifaddrmsg), flags);
         if (nlh == NULL)
                 return -EMSGSIZE;
 
@@ -3652,7 +3652,7 @@ static int in6_dump_addrs(struct inet6_dev *idev, struct sk_buff *skb,
                         if (++ip_idx < s_ip_idx)
                                 continue;
                         err = inet6_fill_ifaddr(skb, ifa,
-                                                NETLINK_CB(cb->skb).pid,
+                                                NETLINK_CB(cb->skb).portid,
                                                 cb->nlh->nlmsg_seq,
                                                 RTM_NEWADDR,
                                                 NLM_F_MULTI);
@@ -3668,7 +3668,7 @@ static int in6_dump_addrs(struct inet6_dev *idev, struct sk_buff *skb,
                         if (ip_idx < s_ip_idx)
                                 continue;
                         err = inet6_fill_ifmcaddr(skb, ifmca,
-                                                  NETLINK_CB(cb->skb).pid,
+                                                  NETLINK_CB(cb->skb).portid,
                                                   cb->nlh->nlmsg_seq,
                                                   RTM_GETMULTICAST,
                                                   NLM_F_MULTI);
@@ -3683,7 +3683,7 @@ static int in6_dump_addrs(struct inet6_dev *idev, struct sk_buff *skb,
                         if (ip_idx < s_ip_idx)
                                 continue;
                         err = inet6_fill_ifacaddr(skb, ifaca,
-                                                  NETLINK_CB(cb->skb).pid,
+                                                  NETLINK_CB(cb->skb).portid,
                                                   cb->nlh->nlmsg_seq,
                                                   RTM_GETANYCAST,
                                                   NLM_F_MULTI);
@@ -3805,7 +3805,7 @@ static int inet6_rtm_getaddr(struct sk_buff *in_skb, struct nlmsghdr *nlh,
                 goto errout_ifa;
         }
 
-        err = inet6_fill_ifaddr(skb, ifa, NETLINK_CB(in_skb).pid,
+        err = inet6_fill_ifaddr(skb, ifa, NETLINK_CB(in_skb).portid,
                                 nlh->nlmsg_seq, RTM_NEWADDR, 0);
         if (err < 0) {
                 /* -EMSGSIZE implies BUG in inet6_ifaddr_msgsize() */
@@ -3813,7 +3813,7 @@ static int inet6_rtm_getaddr(struct sk_buff *in_skb, struct nlmsghdr *nlh,
                 kfree_skb(skb);
                 goto errout_ifa;
         }
-        err = rtnl_unicast(skb, net, NETLINK_CB(in_skb).pid);
+        err = rtnl_unicast(skb, net, NETLINK_CB(in_skb).portid);
 errout_ifa:
         in6_ifa_put(ifa);
 errout:
@@ -4015,14 +4015,14 @@ static int inet6_fill_link_af(struct sk_buff *skb, const struct net_device *dev)
 }
 
 static int inet6_fill_ifinfo(struct sk_buff *skb, struct inet6_dev *idev,
-                             u32 pid, u32 seq, int event, unsigned int flags)
+                             u32 portid, u32 seq, int event, unsigned int flags)
 {
         struct net_device *dev = idev->dev;
         struct ifinfomsg *hdr;
         struct nlmsghdr *nlh;
         void *protoinfo;
 
-        nlh = nlmsg_put(skb, pid, seq, event, sizeof(*hdr), flags);
+        nlh = nlmsg_put(skb, portid, seq, event, sizeof(*hdr), flags);
         if (nlh == NULL)
                 return -EMSGSIZE;
 
@@ -4080,7 +4080,7 @@ static int inet6_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)
                         if (!idev)
                                 goto cont;
                         if (inet6_fill_ifinfo(skb, idev,
-                                              NETLINK_CB(cb->skb).pid,
+                                              NETLINK_CB(cb->skb).portid,
                                               cb->nlh->nlmsg_seq,
                                               RTM_NEWLINK, NLM_F_MULTI) <= 0)
                                 goto out;
@@ -4128,14 +4128,14 @@ static inline size_t inet6_prefix_nlmsg_size(void)
 }
 
 static int inet6_fill_prefix(struct sk_buff *skb, struct inet6_dev *idev,
-                             struct prefix_info *pinfo, u32 pid, u32 seq,
+                             struct prefix_info *pinfo, u32 portid, u32 seq,
                              int event, unsigned int flags)
 {
         struct prefixmsg *pmsg;
         struct nlmsghdr *nlh;
         struct prefix_cacheinfo ci;
 
-        nlh = nlmsg_put(skb, pid, seq, event, sizeof(*pmsg), flags);
+        nlh = nlmsg_put(skb, portid, seq, event, sizeof(*pmsg), flags);
         if (nlh == NULL)
                 return -EMSGSIZE;