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>

2 files changed, 6 insertions, 6 deletions

diff --git a/net/ieee802154/nl-mac.c b/net/ieee802154/nl-mac.c
index 1e9917124e75..96bb08abece2 100644
--- a/net/ieee802154/nl-mac.c
+++ b/net/ieee802154/nl-mac.c
@@ -246,7 +246,7 @@ nla_put_failure:
 }
 EXPORT_SYMBOL(ieee802154_nl_start_confirm);
 
-static int ieee802154_nl_fill_iface(struct sk_buff *msg, u32 pid,
+static int ieee802154_nl_fill_iface(struct sk_buff *msg, u32 portid,
         u32 seq, int flags, struct net_device *dev)
 {
         void *hdr;
@@ -534,7 +534,7 @@ static int ieee802154_list_iface(struct sk_buff *skb,
         if (!msg)
                 goto out_dev;
 
-        rc = ieee802154_nl_fill_iface(msg, info->snd_pid, info->snd_seq,
+        rc = ieee802154_nl_fill_iface(msg, info->snd_portid, info->snd_seq,
                         0, dev);
         if (rc < 0)
                 goto out_free;
@@ -565,7 +565,7 @@ static int ieee802154_dump_iface(struct sk_buff *skb,
                 if (idx < s_idx || (dev->type != ARPHRD_IEEE802154))
                         goto cont;
 
-                if (ieee802154_nl_fill_iface(skb, NETLINK_CB(cb->skb).pid,
+                if (ieee802154_nl_fill_iface(skb, NETLINK_CB(cb->skb).portid,
                         cb->nlh->nlmsg_seq, NLM_F_MULTI, dev) < 0)
                         break;
 cont:
diff --git a/net/ieee802154/nl-phy.c b/net/ieee802154/nl-phy.c
index d54be34cca94..22b1a7058fd3 100644
--- a/net/ieee802154/nl-phy.c
+++ b/net/ieee802154/nl-phy.c
@@ -35,7 +35,7 @@
 
 #include "ieee802154.h"
 
-static int ieee802154_nl_fill_phy(struct sk_buff *msg, u32 pid,
+static int ieee802154_nl_fill_phy(struct sk_buff *msg, u32 portid,
         u32 seq, int flags, struct wpan_phy *phy)
 {
         void *hdr;
@@ -105,7 +105,7 @@ static int ieee802154_list_phy(struct sk_buff *skb,
         if (!msg)
                 goto out_dev;
 
-        rc = ieee802154_nl_fill_phy(msg, info->snd_pid, info->snd_seq,
+        rc = ieee802154_nl_fill_phy(msg, info->snd_portid, info->snd_seq,
                         0, phy);
         if (rc < 0)
                 goto out_free;
@@ -138,7 +138,7 @@ static int ieee802154_dump_phy_iter(struct wpan_phy *phy, void *_data)
                 return 0;
 
         rc = ieee802154_nl_fill_phy(data->skb,
-                        NETLINK_CB(data->cb->skb).pid,
+                        NETLINK_CB(data->cb->skb).portid,
                         data->cb->nlh->nlmsg_seq,
                         NLM_F_MULTI,
                         phy);