From 021991222d7348badf2735e33fb49444f107c812 Mon Sep 17 00:00:00 2001
From: Lars Ellenberg <lars.ellenberg@linbit.com>
Date: Fri, 19 Aug 2011 10:39:00 +0200
Subject: [PATCH] --- yaml --- r: 346129 b: refs/heads/master c:
 25e409321a950b8888830c6ddb7a9774ec38f608 h: refs/heads/master i:   346127:
 efdf9930dbf1a6a7fabd1569a97c5e1f25640be3 v: v3

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

diff --git a/[refs] b/[refs]
index aa05e7482b4e..1dc31035143b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a209b4aec31d4b672b7a70f5de272ebf6ce40e1b
+refs/heads/master: 25e409321a950b8888830c6ddb7a9774ec38f608
diff --git a/trunk/drivers/block/drbd/drbd_nl.c b/trunk/drivers/block/drbd/drbd_nl.c
index 684e2e4d48e1..e64b1c897c82 100644
--- a/trunk/drivers/block/drbd/drbd_nl.c
+++ b/trunk/drivers/block/drbd/drbd_nl.c
@@ -2048,7 +2048,7 @@ int drbd_adm_connect(struct sk_buff *skb, struct genl_info *info)
 	set_net_conf_defaults(new_conf);
 
 	err = net_conf_from_attrs(new_conf, info);
-	if (err) {
+	if (err && err != -ENOMSG) {
 		retcode = ERR_MANDATORY_TAG;
 		drbd_msg_put_info(from_attrs_err_to_txt(err));
 		goto fail;