Skip to content

Commit

Permalink
decnet: dn_table: Move away from NLMSG_NEW().
Browse files Browse the repository at this point in the history
And use nlmsg_data() while we're here too.

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Jun 27, 2012
1 parent 737100e commit 3f7a328
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions net/decnet/dn_table.c
Original file line number Diff line number Diff line change
Expand Up @@ -299,8 +299,10 @@ static int dn_fib_dump_info(struct sk_buff *skb, u32 pid, u32 seq, int event,
struct nlmsghdr *nlh;
unsigned char *b = skb_tail_pointer(skb);

nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*rtm), flags);
rtm = NLMSG_DATA(nlh);
nlh = nlmsg_put(skb, pid, seq, event, sizeof(*rtm), flags);
if (!nlh)
goto out_nlmsg_trim;
rtm = nlmsg_data(nlh);
rtm->rtm_family = AF_DECnet;
rtm->rtm_dst_len = dst_len;
rtm->rtm_src_len = 0;
Expand Down Expand Up @@ -348,8 +350,7 @@ static int dn_fib_dump_info(struct sk_buff *skb, u32 pid, u32 seq, int event,
nlh->nlmsg_len = skb_tail_pointer(skb) - b;
return skb->len;


nlmsg_failure:
out_nlmsg_trim:
rtattr_failure:
nlmsg_trim(skb, b);
return -EMSGSIZE;
Expand Down Expand Up @@ -476,7 +477,7 @@ int dn_fib_dump(struct sk_buff *skb, struct netlink_callback *cb)
return 0;

if (NLMSG_PAYLOAD(cb->nlh, 0) >= sizeof(struct rtmsg) &&
((struct rtmsg *)NLMSG_DATA(cb->nlh))->rtm_flags&RTM_F_CLONED)
((struct rtmsg *)nlmsg_data(cb->nlh))->rtm_flags&RTM_F_CLONED)
return dn_cache_dump(skb, cb);

s_h = cb->args[0];
Expand Down

0 comments on commit 3f7a328

Please sign in to comment.