From: Justin Pettit <jpettit@nicira.com>
Date: Mon, 15 Sep 2008 06:05:37 +0000 (-0700)
Subject: Fix broken stat requests over netlink.
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6026cfb7ab7b6a531c011a59aaf7147973bb4e19;p=sliver-openvswitch.git

Fix broken stat requests over netlink.

A recent change (696db2) modified the way stats were being sent over the
netlink socket.  Unfortunately, the responder set the transaction id to the
type, which caused the requestor to ignore the repsone.
---

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 4cea5a831..428f25e51 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -1577,7 +1577,8 @@ dp_genl_openflow_dumpit(struct sk_buff *skb, struct netlink_callback *cb)
 			return -EINVAL;
 
 		rq = nla_data(va);
-		sender.xid = type = ntohs(rq->type);
+		sender.xid = rq->header.xid;
+		type = ntohs(rq->type);
 		if (rq->header.version != OFP_VERSION) {
 			dp_send_error_msg(dp, &sender, OFPET_BAD_REQUEST,
 					  OFPBRC_BAD_VERSION, rq, len);