can: gw: Properly fill the netlink header when responding to RTM_GETROUTE
authorThomas Graf <tgraf@suug.ch>
Thu, 5 Jul 2012 12:19:57 +0000 (14:19 +0200)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Tue, 10 Jul 2012 20:36:01 +0000 (22:36 +0200)
 - set message type to RTM_NEWROUTE
 - relate to original request by inheriting the sequence and port number.
 - set NLM_F_MULTI because it's a dump and more messages will follow

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Tested-by: Oliver Hartkopp <socketcan@hartkopp.net>
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
net/can/gw.c

index a1c639c730a35502ee5fb31ce337d94d916b4dca..20c36e10ce8586095082d5f0e53c4b9ccf1e20ff 100644 (file)
@@ -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++;