wifi: mac80211: remove link_id parameter from link_info_changed()

Since struct ieee80211_bss_conf already contains link_id,
passing link_id is not necessary.

Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 7d573e90ad818a10e0880ecf739babb3002cdca9..5418c4973501113f0bcd340065591f2c2d328d17 100644 (file)
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -2178,10 +2178,11 @@ static void mac80211_hwsim_vif_info_changed(struct ieee80211_hw *hw,
 static void mac80211_hwsim_link_info_changed(struct ieee80211_hw *hw,
                                             struct ieee80211_vif *vif,
                                             struct ieee80211_bss_conf *info,
-                                            u32 link_id, u64 changed)
+                                            u64 changed)
 {
        struct hwsim_vif_priv *vp = (void *)vif->drv_priv;
        struct mac80211_hwsim_data *data = hw->priv;
+       unsigned int link_id = info->link_id;
        struct mac80211_hwsim_link_data *link_data = &data->link_data[link_id];
 
        hwsim_check_magic(vif);

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index e4ead73c5c436c86e9815d24cc723c4080eeb28e..6fc4253b56449bf0ca671096d31b1637d17fba79 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -4088,7 +4088,6 @@ struct ieee80211_ops {
        void (*link_info_changed)(struct ieee80211_hw *hw,
                                  struct ieee80211_vif *vif,
                                  struct ieee80211_bss_conf *info,
-                                 unsigned int link_id,
                                  u64 changed);
 
        int (*start_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
index 0f06081c68cac9d4b8a39cbf219cbc4b6921e40f..482f5c97a72b12751d6dc047298f65eb04a75f1f 100644 (file)
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
@@ -190,10 +190,10 @@ static inline void drv_link_info_changed(struct ieee80211_local *local,
        if (!check_sdata_in_driver(sdata))
                return;
 
-       trace_drv_link_info_changed(local, sdata, info, link_id, changed);
+       trace_drv_link_info_changed(local, sdata, info, changed);
        if (local->ops->link_info_changed)
                local->ops->link_info_changed(&local->hw, &sdata->vif,
-                                             info, link_id, changed);
+                                             info, changed);
        else if (local->ops->bss_info_changed)
                local->ops->bss_info_changed(&local->hw, &sdata->vif,
                                             info, changed);

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 8d5b18318b20e9a94a87b0dc9f412cf176fda3dd..26bb30606282243b3dc84075e0fb87c0220b5ea7 100644 (file)
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -248,11 +248,10 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata,
 
                /* FIXME: should be for each link */
                trace_drv_link_info_changed(local, sdata, &sdata->vif.bss_conf,
-                                           0, changed);
+                                           changed);
                if (local->ops->link_info_changed)
                        local->ops->link_info_changed(&local->hw, &sdata->vif,
-                                                     &sdata->vif.bss_conf,
-                                                     0, ch);
+                                                     &sdata->vif.bss_conf, ch);
        }
 
        if (local->ops->bss_info_changed)

diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h
index 402110f439f88b197d2bd5e8c810a7ded4742a10..9f4377566c425bbe2ca3884dcb39ef02964327ac 100644 (file)
--- a/net/mac80211/trace.h
+++ b/net/mac80211/trace.h
@@ -449,9 +449,9 @@ TRACE_EVENT(drv_link_info_changed,
        TP_PROTO(struct ieee80211_local *local,
                 struct ieee80211_sub_if_data *sdata,
                 struct ieee80211_bss_conf *link_conf,
-                int link_id, u64 changed),
+                u64 changed),
 
-       TP_ARGS(local, sdata, link_conf, link_id, changed),
+       TP_ARGS(local, sdata, link_conf, changed),
 
        TP_STRUCT__entry(
                LOCAL_ENTRY
@@ -486,7 +486,7 @@ TRACE_EVENT(drv_link_info_changed,
                LOCAL_ASSIGN;
                VIF_ASSIGN;
                __entry->changed = changed;
-               __entry->link_id = link_id;
+               __entry->link_id = link_conf->link_id;
                __entry->shortpre = link_conf->use_short_preamble;
                __entry->cts = link_conf->use_cts_prot;
                __entry->shortslot = link_conf->use_short_slot;