genetlink: pass family to functions using groups

This doesn't really change anything, but prepares for the
next patch that will change the APIs to pass the group ID
within the family, rather than the global group ID.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 35 insertions, 35 deletions

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 1b6c5dd4dccf..f20edfd2e1f0 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -6868,7 +6868,7 @@ void cfg80211_testmode_event(struct sk_buff *skb, gfp_t gfp)
 
         nla_nest_end(skb, data);
         genlmsg_end(skb, hdr);
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), skb, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), skb, 0,
                                 nl80211_testmode_mcgrp.id, gfp);
 }
 EXPORT_SYMBOL(cfg80211_testmode_event);
@@ -9597,7 +9597,7 @@ void nl80211_notify_dev_rename(struct cfg80211_registered_device *rdev)
                 return;
         }
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_config_mcgrp.id, GFP_KERNEL);
 }
 
@@ -9707,7 +9707,7 @@ void nl80211_send_scan_start(struct cfg80211_registered_device *rdev,
                 return;
         }
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_scan_mcgrp.id, GFP_KERNEL);
 }
 
@@ -9726,7 +9726,7 @@ void nl80211_send_scan_done(struct cfg80211_registered_device *rdev,
                 return;
         }
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_scan_mcgrp.id, GFP_KERNEL);
 }
 
@@ -9745,7 +9745,7 @@ void nl80211_send_scan_aborted(struct cfg80211_registered_device *rdev,
                 return;
         }
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_scan_mcgrp.id, GFP_KERNEL);
 }
 
@@ -9764,7 +9764,7 @@ void nl80211_send_sched_scan_results(struct cfg80211_registered_device *rdev,
                 return;
         }
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_scan_mcgrp.id, GFP_KERNEL);
 }
 
@@ -9782,7 +9782,7 @@ void nl80211_send_sched_scan(struct cfg80211_registered_device *rdev,
                 return;
         }
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_scan_mcgrp.id, GFP_KERNEL);
 }
 
@@ -9837,8 +9837,8 @@ void nl80211_send_reg_change_event(struct regulatory_request *request)
         genlmsg_end(msg, hdr);
 
         rcu_read_lock();
-        genlmsg_multicast_allns(msg, 0, nl80211_regulatory_mcgrp.id,
-                                GFP_ATOMIC);
+        genlmsg_multicast_allns(&nl80211_fam, msg, 0,
+                                nl80211_regulatory_mcgrp.id, GFP_ATOMIC);
         rcu_read_unlock();
 
         return;
@@ -9873,7 +9873,7 @@ static void nl80211_send_mlme_event(struct cfg80211_registered_device *rdev,
 
         genlmsg_end(msg, hdr);
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_mlme_mcgrp.id, gfp);
         return;
 
@@ -9961,7 +9961,7 @@ static void nl80211_send_mlme_timeout(struct cfg80211_registered_device *rdev,
 
         genlmsg_end(msg, hdr);
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_mlme_mcgrp.id, gfp);
         return;
 
@@ -10017,7 +10017,7 @@ void nl80211_send_connect_result(struct cfg80211_registered_device *rdev,
 
         genlmsg_end(msg, hdr);
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_mlme_mcgrp.id, gfp);
         return;
 
@@ -10056,7 +10056,7 @@ void nl80211_send_roamed(struct cfg80211_registered_device *rdev,
 
         genlmsg_end(msg, hdr);
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_mlme_mcgrp.id, gfp);
         return;
 
@@ -10094,7 +10094,7 @@ void nl80211_send_disconnected(struct cfg80211_registered_device *rdev,
 
         genlmsg_end(msg, hdr);
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_mlme_mcgrp.id, GFP_KERNEL);
         return;
 
@@ -10128,7 +10128,7 @@ void nl80211_send_ibss_bssid(struct cfg80211_registered_device *rdev,
 
         genlmsg_end(msg, hdr);
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_mlme_mcgrp.id, gfp);
         return;
 
@@ -10169,7 +10169,7 @@ void cfg80211_notify_new_peer_candidate(struct net_device *dev, const u8 *addr,
 
         genlmsg_end(msg, hdr);
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_mlme_mcgrp.id, gfp);
         return;
 
@@ -10208,7 +10208,7 @@ void nl80211_michael_mic_failure(struct cfg80211_registered_device *rdev,
 
         genlmsg_end(msg, hdr);
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_mlme_mcgrp.id, gfp);
         return;
 
@@ -10261,8 +10261,8 @@ void nl80211_send_beacon_hint_event(struct wiphy *wiphy,
         genlmsg_end(msg, hdr);
 
         rcu_read_lock();
-        genlmsg_multicast_allns(msg, 0, nl80211_regulatory_mcgrp.id,
-                                GFP_ATOMIC);
+        genlmsg_multicast_allns(&nl80211_fam, msg, 0,
+                                nl80211_regulatory_mcgrp.id, GFP_ATOMIC);
         rcu_read_unlock();
 
         return;
@@ -10307,7 +10307,7 @@ static void nl80211_send_remain_on_chan_event(
 
         genlmsg_end(msg, hdr);
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_mlme_mcgrp.id, gfp);
         return;
 
@@ -10362,7 +10362,7 @@ void cfg80211_new_sta(struct net_device *dev, const u8 *mac_addr,
                 return;
         }
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_mlme_mcgrp.id, gfp);
 }
 EXPORT_SYMBOL(cfg80211_new_sta);
@@ -10392,7 +10392,7 @@ void cfg80211_del_sta(struct net_device *dev, const u8 *mac_addr, gfp_t gfp)
 
         genlmsg_end(msg, hdr);
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_mlme_mcgrp.id, gfp);
         return;
 
@@ -10428,7 +10428,7 @@ void cfg80211_conn_failed(struct net_device *dev, const u8 *mac_addr,
 
         genlmsg_end(msg, hdr);
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_mlme_mcgrp.id, gfp);
         return;
 
@@ -10590,7 +10590,7 @@ void cfg80211_mgmt_tx_status(struct wireless_dev *wdev, u64 cookie,
 
         genlmsg_end(msg, hdr);
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_mlme_mcgrp.id, gfp);
         return;
 
@@ -10639,7 +10639,7 @@ void cfg80211_cqm_rssi_notify(struct net_device *dev,
 
         genlmsg_end(msg, hdr);
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_mlme_mcgrp.id, gfp);
         return;
 
@@ -10684,7 +10684,7 @@ static void nl80211_gtk_rekey_notify(struct cfg80211_registered_device *rdev,
 
         genlmsg_end(msg, hdr);
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_mlme_mcgrp.id, gfp);
         return;
 
@@ -10742,7 +10742,7 @@ nl80211_pmksa_candidate_notify(struct cfg80211_registered_device *rdev,
 
         genlmsg_end(msg, hdr);
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_mlme_mcgrp.id, gfp);
         return;
 
@@ -10789,7 +10789,7 @@ static void nl80211_ch_switch_notify(struct cfg80211_registered_device *rdev,
 
         genlmsg_end(msg, hdr);
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_mlme_mcgrp.id, gfp);
         return;
 
@@ -10866,7 +10866,7 @@ void cfg80211_cqm_txe_notify(struct net_device *dev,
 
         genlmsg_end(msg, hdr);
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_mlme_mcgrp.id, gfp);
         return;
 
@@ -10915,7 +10915,7 @@ nl80211_radar_notify(struct cfg80211_registered_device *rdev,
 
         genlmsg_end(msg, hdr);
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_mlme_mcgrp.id, gfp);
         return;
 
@@ -10962,7 +10962,7 @@ void cfg80211_cqm_pktloss_notify(struct net_device *dev,
 
         genlmsg_end(msg, hdr);
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_mlme_mcgrp.id, gfp);
         return;
 
@@ -11002,7 +11002,7 @@ void cfg80211_probe_status(struct net_device *dev, const u8 *addr,
 
         genlmsg_end(msg, hdr);
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_mlme_mcgrp.id, gfp);
         return;
 
@@ -11154,7 +11154,7 @@ void cfg80211_report_wowlan_wakeup(struct wireless_dev *wdev,
 
         genlmsg_end(msg, hdr);
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_mlme_mcgrp.id, gfp);
         return;
 
@@ -11196,7 +11196,7 @@ void cfg80211_tdls_oper_request(struct net_device *dev, const u8 *peer,
 
         genlmsg_end(msg, hdr);
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_mlme_mcgrp.id, gfp);
         return;
 
@@ -11279,7 +11279,7 @@ void cfg80211_ft_event(struct net_device *netdev,
 
         genlmsg_end(msg, hdr);
 
-        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+        genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
                                 nl80211_mlme_mcgrp.id, GFP_KERNEL);
 }
 EXPORT_SYMBOL(cfg80211_ft_event);