drbd: Consider all crypto options in connect and in net-options
authorPhilipp Reisner <philipp.reisner@linbit.com>
Wed, 27 Apr 2011 09:27:47 +0000 (11:27 +0200)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Thu, 8 Nov 2012 15:49:08 +0000 (16:49 +0100)
So for this was simply not considered after the options have been
re-arranged.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
drivers/block/drbd/drbd_nl.c

Simple merge