diff options
-rw-r--r-- | net/wireless/nl80211.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index ade40d503bf0..a3a152f55dd0 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c | |||
@@ -3912,18 +3912,13 @@ nla_put_failure: | |||
3912 | 3912 | ||
3913 | int nl80211_init(void) | 3913 | int nl80211_init(void) |
3914 | { | 3914 | { |
3915 | int err, i; | 3915 | int err; |
3916 | 3916 | ||
3917 | err = genl_register_family(&nl80211_fam); | 3917 | err = genl_register_family_with_ops(&nl80211_fam, |
3918 | nl80211_ops, ARRAY_SIZE(nl80211_ops)); | ||
3918 | if (err) | 3919 | if (err) |
3919 | return err; | 3920 | return err; |
3920 | 3921 | ||
3921 | for (i = 0; i < ARRAY_SIZE(nl80211_ops); i++) { | ||
3922 | err = genl_register_ops(&nl80211_fam, &nl80211_ops[i]); | ||
3923 | if (err) | ||
3924 | goto err_out; | ||
3925 | } | ||
3926 | |||
3927 | err = genl_register_mc_group(&nl80211_fam, &nl80211_config_mcgrp); | 3922 | err = genl_register_mc_group(&nl80211_fam, &nl80211_config_mcgrp); |
3928 | if (err) | 3923 | if (err) |
3929 | goto err_out; | 3924 | goto err_out; |