diff --git a/[refs] b/[refs]
index 76e46aebf762..d69f7332aa8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f9359201b5cf1d94fe0e0c47fcba38cfc921863
+refs/heads/master: 5084d71d89e1a94193378efb12ac659e4e6ada3f
diff --git a/trunk/include/linux/genl_magic_func.h b/trunk/include/linux/genl_magic_func.h
index 58edd403a3ff..357f2ad403b1 100644
--- a/trunk/include/linux/genl_magic_func.h
+++ b/trunk/include/linux/genl_magic_func.h
@@ -158,9 +158,9 @@ static inline int drbd_nla_check_mandatory(int maxtype, struct nlattr *nla)
 
 	nla_for_each_attr(nla, head, len, rem) {
 		if (nla->nla_type & DRBD_GENLA_F_MANDATORY) {
+			nla->nla_type &= ~DRBD_GENLA_F_MANDATORY;
 			if (nla_type(nla) > maxtype)
 				return -EOPNOTSUPP;
-			nla->nla_type &= ~DRBD_GENLA_F_MANDATORY;
 		}
 	}
 	return 0;