From: Thomas Graf Date: Sun, 19 Jun 2005 05:51:43 +0000 (-0700) Subject: [NETLINK]: Kill bogus NLMSG_SET_MULTIPART uses. X-Git-Tag: v2.6.14-rc2~49^2~36^2~26 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4b6ea82dd18c97598c3caaa8d0b1feec87857e70;p=linux-2.6-omap-h63xx.git [NETLINK]: Kill bogus NLMSG_SET_MULTIPART uses. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller --- diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 0841ac78c67..d1f8f7847f7 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -1589,9 +1589,9 @@ static int neightbl_fill_info(struct neigh_table *tbl, struct sk_buff *skb, struct ndtmsg *ndtmsg; nlh = NLMSG_PUT_ANSWER(skb, cb, RTM_NEWNEIGHTBL, sizeof(struct ndtmsg)); - ndtmsg = NLMSG_DATA(nlh); + nlh->nlmsg_flags |= NLM_F_MULTI; - NLMSG_SET_MULTIPART(nlh); + ndtmsg = NLMSG_DATA(nlh); read_lock_bh(&tbl->lock); ndtmsg->ndtm_family = tbl->family; @@ -1674,9 +1674,9 @@ static int neightbl_fill_param_info(struct neigh_table *tbl, struct nlmsghdr *nlh; nlh = NLMSG_PUT_ANSWER(skb, cb, RTM_NEWNEIGHTBL, sizeof(struct ndtmsg)); - ndtmsg = NLMSG_DATA(nlh); + nlh->nlmsg_flags |= NLM_F_MULTI; - NLMSG_SET_MULTIPART(nlh); + ndtmsg = NLMSG_DATA(nlh); read_lock_bh(&tbl->lock); ndtmsg->ndtm_family = tbl->family;