Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25e40932 authored by Lars Ellenberg's avatar Lars Ellenberg Committed by Philipp Reisner
Browse files

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: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent a209b4ae

drivers/block/drbd/drbd_nl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2048,7 +2048,7 @@ int drbd_adm_connect(struct sk_buff *skb, struct genl_info *info) 
	set_net_conf_defaults(new_conf);

	set_net_conf_defaults(new_conf);





	err = net_conf_from_attrs(new_conf, info);

	err = net_conf_from_attrs(new_conf, info);

	if (err) {

	if (err && err != -ENOMSG) {

		retcode = ERR_MANDATORY_TAG;

		retcode = ERR_MANDATORY_TAG;

		drbd_msg_put_info(from_attrs_err_to_txt(err));

		drbd_msg_put_info(from_attrs_err_to_txt(err));

		goto fail;

		goto fail;