diff options
Diffstat (limited to 'net/ipv4/ipmr.c')
-rw-r--r-- | net/ipv4/ipmr.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 8aa7a4cf9139..1daa95c2a0ba 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c | |||
@@ -626,7 +626,7 @@ static void ipmr_destroy_unres(struct mr_table *mrt, struct mfc_cache *c) | |||
626 | e->error = -ETIMEDOUT; | 626 | e->error = -ETIMEDOUT; |
627 | memset(&e->msg, 0, sizeof(e->msg)); | 627 | memset(&e->msg, 0, sizeof(e->msg)); |
628 | 628 | ||
629 | rtnl_unicast(skb, net, NETLINK_CB(skb).pid); | 629 | rtnl_unicast(skb, net, NETLINK_CB(skb).portid); |
630 | } else { | 630 | } else { |
631 | kfree_skb(skb); | 631 | kfree_skb(skb); |
632 | } | 632 | } |
@@ -870,7 +870,7 @@ static void ipmr_cache_resolve(struct net *net, struct mr_table *mrt, | |||
870 | memset(&e->msg, 0, sizeof(e->msg)); | 870 | memset(&e->msg, 0, sizeof(e->msg)); |
871 | } | 871 | } |
872 | 872 | ||
873 | rtnl_unicast(skb, net, NETLINK_CB(skb).pid); | 873 | rtnl_unicast(skb, net, NETLINK_CB(skb).portid); |
874 | } else { | 874 | } else { |
875 | ip_mr_forward(net, mrt, skb, c, 0); | 875 | ip_mr_forward(net, mrt, skb, c, 0); |
876 | } | 876 | } |
@@ -2117,12 +2117,12 @@ int ipmr_get_route(struct net *net, struct sk_buff *skb, | |||
2117 | } | 2117 | } |
2118 | 2118 | ||
2119 | static int ipmr_fill_mroute(struct mr_table *mrt, struct sk_buff *skb, | 2119 | static int ipmr_fill_mroute(struct mr_table *mrt, struct sk_buff *skb, |
2120 | u32 pid, u32 seq, struct mfc_cache *c) | 2120 | u32 portid, u32 seq, struct mfc_cache *c) |
2121 | { | 2121 | { |
2122 | struct nlmsghdr *nlh; | 2122 | struct nlmsghdr *nlh; |
2123 | struct rtmsg *rtm; | 2123 | struct rtmsg *rtm; |
2124 | 2124 | ||
2125 | nlh = nlmsg_put(skb, pid, seq, RTM_NEWROUTE, sizeof(*rtm), NLM_F_MULTI); | 2125 | nlh = nlmsg_put(skb, portid, seq, RTM_NEWROUTE, sizeof(*rtm), NLM_F_MULTI); |
2126 | if (nlh == NULL) | 2126 | if (nlh == NULL) |
2127 | return -EMSGSIZE; | 2127 | return -EMSGSIZE; |
2128 | 2128 | ||
@@ -2176,7 +2176,7 @@ static int ipmr_rtm_dumproute(struct sk_buff *skb, struct netlink_callback *cb) | |||
2176 | if (e < s_e) | 2176 | if (e < s_e) |
2177 | goto next_entry; | 2177 | goto next_entry; |
2178 | if (ipmr_fill_mroute(mrt, skb, | 2178 | if (ipmr_fill_mroute(mrt, skb, |
2179 | NETLINK_CB(cb->skb).pid, | 2179 | NETLINK_CB(cb->skb).portid, |
2180 | cb->nlh->nlmsg_seq, | 2180 | cb->nlh->nlmsg_seq, |
2181 | mfc) < 0) | 2181 | mfc) < 0) |
2182 | goto done; | 2182 | goto done; |