From 9593ad5ef294e84dc56f87c23cfd83d868a7ddb4 Mon Sep 17 00:00:00 2001
From: Lars Ellenberg <lars.ellenberg@linbit.com>
Date: Mon, 11 Jul 2011 23:49:55 +0200
Subject: [PATCH] --- yaml --- r: 346103 b: refs/heads/master c:
 367d675da8fa0041e0f336ecf940992837cc4c50 h: refs/heads/master i:   346101:
 ba6349af8c9a81113b7cd71f6adfaa4e7376c09d   346099:
 1d1bcaa497fa42423bf5c2394828e0fd4a450a23   346095:
 47af22a5937c762ac63a7cd0dd28dc41037e5dda v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/block/drbd/drbd_nl.c | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index cef6f97b618d..644f1fff152e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0e1665381a519fd1f588948b1c48b5e609e336d
+refs/heads/master: 367d675da8fa0041e0f336ecf940992837cc4c50
diff --git a/trunk/drivers/block/drbd/drbd_nl.c b/trunk/drivers/block/drbd/drbd_nl.c
index 862d69e9f1ab..c27b428b9a5b 100644
--- a/trunk/drivers/block/drbd/drbd_nl.c
+++ b/trunk/drivers/block/drbd/drbd_nl.c
@@ -2731,14 +2731,18 @@ int get_one_status(struct sk_buff *skb, struct netlink_callback *cb)
 			goto out;
 
 		if (!mdev) {
-			/* this is a tconn without a single volume */
+			/* This is a tconn without a single volume.
+			 * Suprisingly enough, it may have a network
+			 * configuration. */
+			struct net_conf *nc;
 			dh->minor = -1U;
 			dh->ret_code = NO_ERROR;
 			if (nla_put_drbd_cfg_context(skb, tconn, VOLUME_UNSPECIFIED))
-				genlmsg_cancel(skb, dh);
-			else
-				genlmsg_end(skb, dh);
-			goto out;
+				goto cancel;
+			nc = rcu_dereference(tconn->net_conf);
+			if (nc && net_conf_to_skb(skb, nc, 1) != 0)
+				goto cancel;
+			goto done;
 		}
 
 		D_ASSERT(mdev->vnr == volume);
@@ -2748,9 +2752,11 @@ int get_one_status(struct sk_buff *skb, struct netlink_callback *cb)
 		dh->ret_code = NO_ERROR;
 
 		if (nla_put_status_info(skb, mdev, NULL)) {
+cancel:
 			genlmsg_cancel(skb, dh);
 			goto out;
 		}
+done:
 		genlmsg_end(skb, dh);
         }