From 2bdd2218db5f6d62171df062a41cdfdae8b74163 Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Thu, 5 Jul 2012 14:19:57 +0200 Subject: [PATCH] --- yaml --- r: 315171 b: refs/heads/master c: 1da0faa3801e0dcb585b33266a2ac0842f26e58c h: refs/heads/master i: 315169: 874f620a24e3d8f796a771c7c5a0238b4a17d002 315167: f5c0e2a3c64d25471714ec7012b5a2779ac00f10 v: v3 --- [refs] | 2 +- trunk/net/can/gw.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d77058a66b52..4840a0b7dfe3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 732d35fd08058a678327ec908528fcc9514c9e48 +refs/heads/master: 1da0faa3801e0dcb585b33266a2ac0842f26e58c diff --git a/trunk/net/can/gw.c b/trunk/net/can/gw.c index a1c639c730a3..20c36e10ce85 100644 --- a/trunk/net/can/gw.c +++ b/trunk/net/can/gw.c @@ -444,11 +444,14 @@ static int cgw_notifier(struct notifier_block *nb, return NOTIFY_DONE; } -static int cgw_put_job(struct sk_buff *skb, struct cgw_job *gwj) +static int cgw_put_job(struct sk_buff *skb, struct cgw_job *gwj, int type, + u32 pid, u32 seq, int flags) { struct cgw_frame_mod mb; struct rtcanmsg *rtcan; - struct nlmsghdr *nlh = nlmsg_put(skb, 0, 0, 0, sizeof(*rtcan), 0); + struct nlmsghdr *nlh; + + nlh = nlmsg_put(skb, pid, seq, type, sizeof(*rtcan), flags); if (!nlh) return -EMSGSIZE; @@ -546,7 +549,8 @@ static int cgw_dump_jobs(struct sk_buff *skb, struct netlink_callback *cb) if (idx < s_idx) goto cont; - if (cgw_put_job(skb, gwj) < 0) + if (cgw_put_job(skb, gwj, RTM_NEWROUTE, NETLINK_CB(cb->skb).pid, + cb->nlh->nlmsg_seq, NLM_F_MULTI) < 0) break; cont: idx++;