aboutsummaryrefslogtreecommitdiff
path: root/drivers/block/drbd
diff options
context:
space:
mode:
authorLars Ellenberg <lars.ellenberg@linbit.com>2011-08-19 10:39:00 +0200
committerPhilipp Reisner <philipp.reisner@linbit.com>2012-11-08 16:58:03 +0100
commit25e409321a950b8888830c6ddb7a9774ec38f608 (patch)
tree9b1982137bbf5303efd358e891d732e692bd29ad /drivers/block/drbd
parenta209b4aec31d4b672b7a70f5de272ebf6ce40e1b (diff)
downloadvexpress-lsk-25e409321a950b8888830c6ddb7a9774ec38f608.tar.gz
drbd: fix connect failure with all default net-options
If no net-options are configured (all on their default), no DRBD_NLA_NET_CONF will be passed to the kernel. The kernel must not require its presence, there is no required option in there. Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd')
-rw-r--r--drivers/block/drbd/drbd_nl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 684e2e4d48e..e64b1c897c8 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/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;