diff options
Diffstat (limited to 'net/decnet/dn_table.c')
-rw-r--r-- | net/decnet/dn_table.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/decnet/dn_table.c b/net/decnet/dn_table.c index 16c986ab1228..f968c1b58f47 100644 --- a/net/decnet/dn_table.c +++ b/net/decnet/dn_table.c | |||
@@ -291,14 +291,14 @@ static inline size_t dn_fib_nlmsg_size(struct dn_fib_info *fi) | |||
291 | return payload; | 291 | return payload; |
292 | } | 292 | } |
293 | 293 | ||
294 | static int dn_fib_dump_info(struct sk_buff *skb, u32 pid, u32 seq, int event, | 294 | static int dn_fib_dump_info(struct sk_buff *skb, u32 portid, u32 seq, int event, |
295 | u32 tb_id, u8 type, u8 scope, void *dst, int dst_len, | 295 | u32 tb_id, u8 type, u8 scope, void *dst, int dst_len, |
296 | struct dn_fib_info *fi, unsigned int flags) | 296 | struct dn_fib_info *fi, unsigned int flags) |
297 | { | 297 | { |
298 | struct rtmsg *rtm; | 298 | struct rtmsg *rtm; |
299 | struct nlmsghdr *nlh; | 299 | struct nlmsghdr *nlh; |
300 | 300 | ||
301 | nlh = nlmsg_put(skb, pid, seq, event, sizeof(*rtm), flags); | 301 | nlh = nlmsg_put(skb, portid, seq, event, sizeof(*rtm), flags); |
302 | if (!nlh) | 302 | if (!nlh) |
303 | return -EMSGSIZE; | 303 | return -EMSGSIZE; |
304 | 304 | ||
@@ -374,14 +374,14 @@ static void dn_rtmsg_fib(int event, struct dn_fib_node *f, int z, u32 tb_id, | |||
374 | struct nlmsghdr *nlh, struct netlink_skb_parms *req) | 374 | struct nlmsghdr *nlh, struct netlink_skb_parms *req) |
375 | { | 375 | { |
376 | struct sk_buff *skb; | 376 | struct sk_buff *skb; |
377 | u32 pid = req ? req->pid : 0; | 377 | u32 portid = req ? req->portid : 0; |
378 | int err = -ENOBUFS; | 378 | int err = -ENOBUFS; |
379 | 379 | ||
380 | skb = nlmsg_new(dn_fib_nlmsg_size(DN_FIB_INFO(f)), GFP_KERNEL); | 380 | skb = nlmsg_new(dn_fib_nlmsg_size(DN_FIB_INFO(f)), GFP_KERNEL); |
381 | if (skb == NULL) | 381 | if (skb == NULL) |
382 | goto errout; | 382 | goto errout; |
383 | 383 | ||
384 | err = dn_fib_dump_info(skb, pid, nlh->nlmsg_seq, event, tb_id, | 384 | err = dn_fib_dump_info(skb, portid, nlh->nlmsg_seq, event, tb_id, |
385 | f->fn_type, f->fn_scope, &f->fn_key, z, | 385 | f->fn_type, f->fn_scope, &f->fn_key, z, |
386 | DN_FIB_INFO(f), 0); | 386 | DN_FIB_INFO(f), 0); |
387 | if (err < 0) { | 387 | if (err < 0) { |
@@ -390,7 +390,7 @@ static void dn_rtmsg_fib(int event, struct dn_fib_node *f, int z, u32 tb_id, | |||
390 | kfree_skb(skb); | 390 | kfree_skb(skb); |
391 | goto errout; | 391 | goto errout; |
392 | } | 392 | } |
393 | rtnl_notify(skb, &init_net, pid, RTNLGRP_DECnet_ROUTE, nlh, GFP_KERNEL); | 393 | rtnl_notify(skb, &init_net, portid, RTNLGRP_DECnet_ROUTE, nlh, GFP_KERNEL); |
394 | return; | 394 | return; |
395 | errout: | 395 | errout: |
396 | if (err < 0) | 396 | if (err < 0) |
@@ -411,7 +411,7 @@ static __inline__ int dn_hash_dump_bucket(struct sk_buff *skb, | |||
411 | continue; | 411 | continue; |
412 | if (f->fn_state & DN_S_ZOMBIE) | 412 | if (f->fn_state & DN_S_ZOMBIE) |
413 | continue; | 413 | continue; |
414 | if (dn_fib_dump_info(skb, NETLINK_CB(cb->skb).pid, | 414 | if (dn_fib_dump_info(skb, NETLINK_CB(cb->skb).portid, |
415 | cb->nlh->nlmsg_seq, | 415 | cb->nlh->nlmsg_seq, |
416 | RTM_NEWROUTE, | 416 | RTM_NEWROUTE, |
417 | tb->n, | 417 | tb->n, |