diff --git a/[refs] b/[refs]
index 3d7aefbdb8e9..cfb584483e7c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ae740df3a9c68622156476dca29991de664fae4
+refs/heads/master: 0d63cbb535a9525445513389370d35b522a700f1
diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c
index ade40d503bf0..a3a152f55dd0 100644
--- a/trunk/net/wireless/nl80211.c
+++ b/trunk/net/wireless/nl80211.c
@@ -3912,18 +3912,13 @@ void nl80211_send_beacon_hint_event(struct wiphy *wiphy,
 
 int nl80211_init(void)
 {
-	int err, i;
+	int err;
 
-	err = genl_register_family(&nl80211_fam);
+	err = genl_register_family_with_ops(&nl80211_fam,
+		nl80211_ops, ARRAY_SIZE(nl80211_ops));
 	if (err)
 		return err;
 
-	for (i = 0; i < ARRAY_SIZE(nl80211_ops); i++) {
-		err = genl_register_ops(&nl80211_fam, &nl80211_ops[i]);
-		if (err)
-			goto err_out;
-	}
-
 	err = genl_register_mc_group(&nl80211_fam, &nl80211_config_mcgrp);
 	if (err)
 		goto err_out;