diff options
author | Johannes Berg <johannes.berg@intel.com> | 2014-05-19 11:19:31 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-05-19 11:34:42 -0400 |
commit | 3b3a0162fade6b83d5c83efafcd5adb9e4537047 (patch) | |
tree | 072fafe0ab7e1f93debdd466302bcda6ae5dfdb3 /drivers | |
parent | 8d77ec856200df31623074de3fde44519df7725b (diff) |
cfg80211: constify MAC addresses in cfg80211 ops
This propagates through all the drivers and mac80211.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/cfg80211.c | 7 | ||||
-rw-r--r-- | drivers/net/wireless/ath/wil6210/cfg80211.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/ath/wil6210/main.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/ath/wil6210/wil6210.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/cfg.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/11n.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/cfg80211.c | 19 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/main.h | 22 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/tdls.c | 44 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/util.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/wmm.c | 10 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/wmm.h | 5 | ||||
-rw-r--r-- | drivers/net/wireless/rndis_wlan.c | 4 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/cfg80211.c | 2 |
15 files changed, 71 insertions, 68 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c index c2c6f4604958..1fffbde4b01e 100644 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c | |||
@@ -1759,7 +1759,7 @@ static bool is_rate_ht40(s32 rate, u8 *mcs, bool *sgi) | |||
1759 | } | 1759 | } |
1760 | 1760 | ||
1761 | static int ath6kl_get_station(struct wiphy *wiphy, struct net_device *dev, | 1761 | static int ath6kl_get_station(struct wiphy *wiphy, struct net_device *dev, |
1762 | u8 *mac, struct station_info *sinfo) | 1762 | const u8 *mac, struct station_info *sinfo) |
1763 | { | 1763 | { |
1764 | struct ath6kl *ar = ath6kl_priv(dev); | 1764 | struct ath6kl *ar = ath6kl_priv(dev); |
1765 | struct ath6kl_vif *vif = netdev_priv(dev); | 1765 | struct ath6kl_vif *vif = netdev_priv(dev); |
@@ -2975,7 +2975,7 @@ static int ath6kl_stop_ap(struct wiphy *wiphy, struct net_device *dev) | |||
2975 | static const u8 bcast_addr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; | 2975 | static const u8 bcast_addr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; |
2976 | 2976 | ||
2977 | static int ath6kl_del_station(struct wiphy *wiphy, struct net_device *dev, | 2977 | static int ath6kl_del_station(struct wiphy *wiphy, struct net_device *dev, |
2978 | u8 *mac) | 2978 | const u8 *mac) |
2979 | { | 2979 | { |
2980 | struct ath6kl *ar = ath6kl_priv(dev); | 2980 | struct ath6kl *ar = ath6kl_priv(dev); |
2981 | struct ath6kl_vif *vif = netdev_priv(dev); | 2981 | struct ath6kl_vif *vif = netdev_priv(dev); |
@@ -2986,7 +2986,8 @@ static int ath6kl_del_station(struct wiphy *wiphy, struct net_device *dev, | |||
2986 | } | 2986 | } |
2987 | 2987 | ||
2988 | static int ath6kl_change_station(struct wiphy *wiphy, struct net_device *dev, | 2988 | static int ath6kl_change_station(struct wiphy *wiphy, struct net_device *dev, |
2989 | u8 *mac, struct station_parameters *params) | 2989 | const u8 *mac, |
2990 | struct station_parameters *params) | ||
2990 | { | 2991 | { |
2991 | struct ath6kl *ar = ath6kl_priv(dev); | 2992 | struct ath6kl *ar = ath6kl_priv(dev); |
2992 | struct ath6kl_vif *vif = netdev_priv(dev); | 2993 | struct ath6kl_vif *vif = netdev_priv(dev); |
diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c index 4806a49cb61b..6e699d050d1e 100644 --- a/drivers/net/wireless/ath/wil6210/cfg80211.c +++ b/drivers/net/wireless/ath/wil6210/cfg80211.c | |||
@@ -172,7 +172,7 @@ static int wil_cid_fill_sinfo(struct wil6210_priv *wil, int cid, | |||
172 | 172 | ||
173 | static int wil_cfg80211_get_station(struct wiphy *wiphy, | 173 | static int wil_cfg80211_get_station(struct wiphy *wiphy, |
174 | struct net_device *ndev, | 174 | struct net_device *ndev, |
175 | u8 *mac, struct station_info *sinfo) | 175 | const u8 *mac, struct station_info *sinfo) |
176 | { | 176 | { |
177 | struct wil6210_priv *wil = wiphy_to_wil(wiphy); | 177 | struct wil6210_priv *wil = wiphy_to_wil(wiphy); |
178 | int rc; | 178 | int rc; |
@@ -671,7 +671,7 @@ static int wil_cfg80211_stop_ap(struct wiphy *wiphy, | |||
671 | } | 671 | } |
672 | 672 | ||
673 | static int wil_cfg80211_del_station(struct wiphy *wiphy, | 673 | static int wil_cfg80211_del_station(struct wiphy *wiphy, |
674 | struct net_device *dev, u8 *mac) | 674 | struct net_device *dev, const u8 *mac) |
675 | { | 675 | { |
676 | struct wil6210_priv *wil = wiphy_to_wil(wiphy); | 676 | struct wil6210_priv *wil = wiphy_to_wil(wiphy); |
677 | 677 | ||
diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c index 95f4efe9ef37..a6b1d5872786 100644 --- a/drivers/net/wireless/ath/wil6210/main.c +++ b/drivers/net/wireless/ath/wil6210/main.c | |||
@@ -81,7 +81,7 @@ static void wil_disconnect_cid(struct wil6210_priv *wil, int cid) | |||
81 | memset(&sta->stats, 0, sizeof(sta->stats)); | 81 | memset(&sta->stats, 0, sizeof(sta->stats)); |
82 | } | 82 | } |
83 | 83 | ||
84 | static void _wil6210_disconnect(struct wil6210_priv *wil, void *bssid) | 84 | static void _wil6210_disconnect(struct wil6210_priv *wil, const u8 *bssid) |
85 | { | 85 | { |
86 | int cid = -ENOENT; | 86 | int cid = -ENOENT; |
87 | struct net_device *ndev = wil_to_ndev(wil); | 87 | struct net_device *ndev = wil_to_ndev(wil); |
@@ -252,7 +252,7 @@ int wil_priv_init(struct wil6210_priv *wil) | |||
252 | return 0; | 252 | return 0; |
253 | } | 253 | } |
254 | 254 | ||
255 | void wil6210_disconnect(struct wil6210_priv *wil, void *bssid) | 255 | void wil6210_disconnect(struct wil6210_priv *wil, const u8 *bssid) |
256 | { | 256 | { |
257 | del_timer_sync(&wil->connect_timer); | 257 | del_timer_sync(&wil->connect_timer); |
258 | _wil6210_disconnect(wil, bssid); | 258 | _wil6210_disconnect(wil, bssid); |
diff --git a/drivers/net/wireless/ath/wil6210/wil6210.h b/drivers/net/wireless/ath/wil6210/wil6210.h index 2a2dec75f026..6b353be64579 100644 --- a/drivers/net/wireless/ath/wil6210/wil6210.h +++ b/drivers/net/wireless/ath/wil6210/wil6210.h | |||
@@ -507,7 +507,7 @@ void wil_wdev_free(struct wil6210_priv *wil); | |||
507 | int wmi_set_mac_address(struct wil6210_priv *wil, void *addr); | 507 | int wmi_set_mac_address(struct wil6210_priv *wil, void *addr); |
508 | int wmi_pcp_start(struct wil6210_priv *wil, int bi, u8 wmi_nettype, u8 chan); | 508 | int wmi_pcp_start(struct wil6210_priv *wil, int bi, u8 wmi_nettype, u8 chan); |
509 | int wmi_pcp_stop(struct wil6210_priv *wil); | 509 | int wmi_pcp_stop(struct wil6210_priv *wil); |
510 | void wil6210_disconnect(struct wil6210_priv *wil, void *bssid); | 510 | void wil6210_disconnect(struct wil6210_priv *wil, const u8 *bssid); |
511 | 511 | ||
512 | int wil_rx_init(struct wil6210_priv *wil); | 512 | int wil_rx_init(struct wil6210_priv *wil); |
513 | void wil_rx_fini(struct wil6210_priv *wil); | 513 | void wil_rx_fini(struct wil6210_priv *wil); |
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c index afb3d15e38ff..befa9c04166d 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | |||
@@ -2182,7 +2182,7 @@ brcmf_cfg80211_config_default_mgmt_key(struct wiphy *wiphy, | |||
2182 | 2182 | ||
2183 | static s32 | 2183 | static s32 |
2184 | brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev, | 2184 | brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev, |
2185 | u8 *mac, struct station_info *sinfo) | 2185 | const u8 *mac, struct station_info *sinfo) |
2186 | { | 2186 | { |
2187 | struct brcmf_if *ifp = netdev_priv(ndev); | 2187 | struct brcmf_if *ifp = netdev_priv(ndev); |
2188 | struct brcmf_cfg80211_profile *profile = &ifp->vif->profile; | 2188 | struct brcmf_cfg80211_profile *profile = &ifp->vif->profile; |
@@ -3975,7 +3975,7 @@ brcmf_cfg80211_change_beacon(struct wiphy *wiphy, struct net_device *ndev, | |||
3975 | 3975 | ||
3976 | static int | 3976 | static int |
3977 | brcmf_cfg80211_del_station(struct wiphy *wiphy, struct net_device *ndev, | 3977 | brcmf_cfg80211_del_station(struct wiphy *wiphy, struct net_device *ndev, |
3978 | u8 *mac) | 3978 | const u8 *mac) |
3979 | { | 3979 | { |
3980 | struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy); | 3980 | struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy); |
3981 | struct brcmf_scb_val_le scbval; | 3981 | struct brcmf_scb_val_le scbval; |
@@ -4203,7 +4203,7 @@ static int brcmf_convert_nl80211_tdls_oper(enum nl80211_tdls_operation oper) | |||
4203 | } | 4203 | } |
4204 | 4204 | ||
4205 | static int brcmf_cfg80211_tdls_oper(struct wiphy *wiphy, | 4205 | static int brcmf_cfg80211_tdls_oper(struct wiphy *wiphy, |
4206 | struct net_device *ndev, u8 *peer, | 4206 | struct net_device *ndev, const u8 *peer, |
4207 | enum nl80211_tdls_operation oper) | 4207 | enum nl80211_tdls_operation oper) |
4208 | { | 4208 | { |
4209 | struct brcmf_if *ifp; | 4209 | struct brcmf_if *ifp; |
diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c index 54e344aed6e0..e4d7031df05c 100644 --- a/drivers/net/wireless/libertas/cfg.c +++ b/drivers/net/wireless/libertas/cfg.c | |||
@@ -1610,7 +1610,7 @@ static int lbs_cfg_del_key(struct wiphy *wiphy, struct net_device *netdev, | |||
1610 | */ | 1610 | */ |
1611 | 1611 | ||
1612 | static int lbs_cfg_get_station(struct wiphy *wiphy, struct net_device *dev, | 1612 | static int lbs_cfg_get_station(struct wiphy *wiphy, struct net_device *dev, |
1613 | u8 *mac, struct station_info *sinfo) | 1613 | const u8 *mac, struct station_info *sinfo) |
1614 | { | 1614 | { |
1615 | struct lbs_private *priv = wiphy_priv(wiphy); | 1615 | struct lbs_private *priv = wiphy_priv(wiphy); |
1616 | s8 signal, noise; | 1616 | s8 signal, noise; |
diff --git a/drivers/net/wireless/mwifiex/11n.h b/drivers/net/wireless/mwifiex/11n.h index 40b007a00f4b..0a46aab24214 100644 --- a/drivers/net/wireless/mwifiex/11n.h +++ b/drivers/net/wireless/mwifiex/11n.h | |||
@@ -199,7 +199,7 @@ static inline int mwifiex_is_sta_11n_enabled(struct mwifiex_private *priv, | |||
199 | } | 199 | } |
200 | 200 | ||
201 | static inline u8 | 201 | static inline u8 |
202 | mwifiex_tdls_peer_11n_enabled(struct mwifiex_private *priv, u8 *ra) | 202 | mwifiex_tdls_peer_11n_enabled(struct mwifiex_private *priv, const u8 *ra) |
203 | { | 203 | { |
204 | struct mwifiex_sta_node *node = mwifiex_get_sta_entry(priv, ra); | 204 | struct mwifiex_sta_node *node = mwifiex_get_sta_entry(priv, ra); |
205 | if (node) | 205 | if (node) |
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c index 21ee27ab7b74..e95dec91a561 100644 --- a/drivers/net/wireless/mwifiex/cfg80211.c +++ b/drivers/net/wireless/mwifiex/cfg80211.c | |||
@@ -994,7 +994,7 @@ mwifiex_dump_station_info(struct mwifiex_private *priv, | |||
994 | */ | 994 | */ |
995 | static int | 995 | static int |
996 | mwifiex_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, | 996 | mwifiex_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, |
997 | u8 *mac, struct station_info *sinfo) | 997 | const u8 *mac, struct station_info *sinfo) |
998 | { | 998 | { |
999 | struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev); | 999 | struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev); |
1000 | 1000 | ||
@@ -1270,7 +1270,7 @@ static int mwifiex_cfg80211_change_beacon(struct wiphy *wiphy, | |||
1270 | */ | 1270 | */ |
1271 | static int | 1271 | static int |
1272 | mwifiex_cfg80211_del_station(struct wiphy *wiphy, struct net_device *dev, | 1272 | mwifiex_cfg80211_del_station(struct wiphy *wiphy, struct net_device *dev, |
1273 | u8 *mac) | 1273 | const u8 *mac) |
1274 | { | 1274 | { |
1275 | struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev); | 1275 | struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev); |
1276 | struct mwifiex_sta_node *sta_node; | 1276 | struct mwifiex_sta_node *sta_node; |
@@ -2629,7 +2629,7 @@ static int mwifiex_cfg80211_set_coalesce(struct wiphy *wiphy, | |||
2629 | */ | 2629 | */ |
2630 | static int | 2630 | static int |
2631 | mwifiex_cfg80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev, | 2631 | mwifiex_cfg80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev, |
2632 | u8 *peer, u8 action_code, u8 dialog_token, | 2632 | const u8 *peer, u8 action_code, u8 dialog_token, |
2633 | u16 status_code, u32 peer_capability, | 2633 | u16 status_code, u32 peer_capability, |
2634 | const u8 *extra_ies, size_t extra_ies_len) | 2634 | const u8 *extra_ies, size_t extra_ies_len) |
2635 | { | 2635 | { |
@@ -2701,7 +2701,7 @@ mwifiex_cfg80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev, | |||
2701 | 2701 | ||
2702 | static int | 2702 | static int |
2703 | mwifiex_cfg80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev, | 2703 | mwifiex_cfg80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev, |
2704 | u8 *peer, enum nl80211_tdls_operation action) | 2704 | const u8 *peer, enum nl80211_tdls_operation action) |
2705 | { | 2705 | { |
2706 | struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev); | 2706 | struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev); |
2707 | 2707 | ||
@@ -2748,9 +2748,8 @@ mwifiex_cfg80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev, | |||
2748 | } | 2748 | } |
2749 | 2749 | ||
2750 | static int | 2750 | static int |
2751 | mwifiex_cfg80211_add_station(struct wiphy *wiphy, | 2751 | mwifiex_cfg80211_add_station(struct wiphy *wiphy, struct net_device *dev, |
2752 | struct net_device *dev, | 2752 | const u8 *mac, struct station_parameters *params) |
2753 | u8 *mac, struct station_parameters *params) | ||
2754 | { | 2753 | { |
2755 | struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev); | 2754 | struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev); |
2756 | 2755 | ||
@@ -2765,9 +2764,9 @@ mwifiex_cfg80211_add_station(struct wiphy *wiphy, | |||
2765 | } | 2764 | } |
2766 | 2765 | ||
2767 | static int | 2766 | static int |
2768 | mwifiex_cfg80211_change_station(struct wiphy *wiphy, | 2767 | mwifiex_cfg80211_change_station(struct wiphy *wiphy, struct net_device *dev, |
2769 | struct net_device *dev, | 2768 | const u8 *mac, |
2770 | u8 *mac, struct station_parameters *params) | 2769 | struct station_parameters *params) |
2771 | { | 2770 | { |
2772 | int ret; | 2771 | int ret; |
2773 | struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev); | 2772 | struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev); |
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h index d53e1e8c9467..86c6b8cdec22 100644 --- a/drivers/net/wireless/mwifiex/main.h +++ b/drivers/net/wireless/mwifiex/main.h | |||
@@ -910,8 +910,6 @@ int mwifiex_handle_uap_rx_forward(struct mwifiex_private *priv, | |||
910 | struct sk_buff *skb); | 910 | struct sk_buff *skb); |
911 | int mwifiex_process_sta_event(struct mwifiex_private *); | 911 | int mwifiex_process_sta_event(struct mwifiex_private *); |
912 | int mwifiex_process_uap_event(struct mwifiex_private *); | 912 | int mwifiex_process_uap_event(struct mwifiex_private *); |
913 | struct mwifiex_sta_node * | ||
914 | mwifiex_get_sta_entry(struct mwifiex_private *priv, u8 *mac); | ||
915 | void mwifiex_delete_all_station_list(struct mwifiex_private *priv); | 913 | void mwifiex_delete_all_station_list(struct mwifiex_private *priv); |
916 | void *mwifiex_process_sta_txpd(struct mwifiex_private *, struct sk_buff *skb); | 914 | void *mwifiex_process_sta_txpd(struct mwifiex_private *, struct sk_buff *skb); |
917 | void *mwifiex_process_uap_txpd(struct mwifiex_private *, struct sk_buff *skb); | 915 | void *mwifiex_process_uap_txpd(struct mwifiex_private *, struct sk_buff *skb); |
@@ -1220,26 +1218,26 @@ void mwifiex_dnld_txpwr_table(struct mwifiex_private *priv); | |||
1220 | extern const struct ethtool_ops mwifiex_ethtool_ops; | 1218 | extern const struct ethtool_ops mwifiex_ethtool_ops; |
1221 | 1219 | ||
1222 | void mwifiex_del_all_sta_list(struct mwifiex_private *priv); | 1220 | void mwifiex_del_all_sta_list(struct mwifiex_private *priv); |
1223 | void mwifiex_del_sta_entry(struct mwifiex_private *priv, u8 *mac); | 1221 | void mwifiex_del_sta_entry(struct mwifiex_private *priv, const u8 *mac); |
1224 | void | 1222 | void |
1225 | mwifiex_set_sta_ht_cap(struct mwifiex_private *priv, const u8 *ies, | 1223 | mwifiex_set_sta_ht_cap(struct mwifiex_private *priv, const u8 *ies, |
1226 | int ies_len, struct mwifiex_sta_node *node); | 1224 | int ies_len, struct mwifiex_sta_node *node); |
1227 | struct mwifiex_sta_node * | 1225 | struct mwifiex_sta_node * |
1228 | mwifiex_add_sta_entry(struct mwifiex_private *priv, u8 *mac); | 1226 | mwifiex_add_sta_entry(struct mwifiex_private *priv, const u8 *mac); |
1229 | struct mwifiex_sta_node * | 1227 | struct mwifiex_sta_node * |
1230 | mwifiex_get_sta_entry(struct mwifiex_private *priv, u8 *mac); | 1228 | mwifiex_get_sta_entry(struct mwifiex_private *priv, const u8 *mac); |
1231 | int mwifiex_send_tdls_data_frame(struct mwifiex_private *priv, u8 *peer, | 1229 | int mwifiex_send_tdls_data_frame(struct mwifiex_private *priv, const u8 *peer, |
1232 | u8 action_code, u8 dialog_token, | 1230 | u8 action_code, u8 dialog_token, |
1233 | u16 status_code, const u8 *extra_ies, | 1231 | u16 status_code, const u8 *extra_ies, |
1234 | size_t extra_ies_len); | 1232 | size_t extra_ies_len); |
1235 | int mwifiex_send_tdls_action_frame(struct mwifiex_private *priv, | 1233 | int mwifiex_send_tdls_action_frame(struct mwifiex_private *priv, const u8 *peer, |
1236 | u8 *peer, u8 action_code, u8 dialog_token, | 1234 | u8 action_code, u8 dialog_token, |
1237 | u16 status_code, const u8 *extra_ies, | 1235 | u16 status_code, const u8 *extra_ies, |
1238 | size_t extra_ies_len); | 1236 | size_t extra_ies_len); |
1239 | void mwifiex_process_tdls_action_frame(struct mwifiex_private *priv, | 1237 | void mwifiex_process_tdls_action_frame(struct mwifiex_private *priv, |
1240 | u8 *buf, int len); | 1238 | u8 *buf, int len); |
1241 | int mwifiex_tdls_oper(struct mwifiex_private *priv, u8 *peer, u8 action); | 1239 | int mwifiex_tdls_oper(struct mwifiex_private *priv, const u8 *peer, u8 action); |
1242 | int mwifiex_get_tdls_link_status(struct mwifiex_private *priv, u8 *mac); | 1240 | int mwifiex_get_tdls_link_status(struct mwifiex_private *priv, const u8 *mac); |
1243 | void mwifiex_disable_all_tdls_links(struct mwifiex_private *priv); | 1241 | void mwifiex_disable_all_tdls_links(struct mwifiex_private *priv); |
1244 | bool mwifiex_is_bss_in_11ac_mode(struct mwifiex_private *priv); | 1242 | bool mwifiex_is_bss_in_11ac_mode(struct mwifiex_private *priv); |
1245 | u8 mwifiex_get_center_freq_index(struct mwifiex_private *priv, u8 band, | 1243 | u8 mwifiex_get_center_freq_index(struct mwifiex_private *priv, u8 band, |
diff --git a/drivers/net/wireless/mwifiex/tdls.c b/drivers/net/wireless/mwifiex/tdls.c index 97662a1ba58c..49c8a2c64eeb 100644 --- a/drivers/net/wireless/mwifiex/tdls.c +++ b/drivers/net/wireless/mwifiex/tdls.c | |||
@@ -25,8 +25,8 @@ | |||
25 | #define TDLS_RESP_FIX_LEN 8 | 25 | #define TDLS_RESP_FIX_LEN 8 |
26 | #define TDLS_CONFIRM_FIX_LEN 6 | 26 | #define TDLS_CONFIRM_FIX_LEN 6 |
27 | 27 | ||
28 | static void | 28 | static void mwifiex_restore_tdls_packets(struct mwifiex_private *priv, |
29 | mwifiex_restore_tdls_packets(struct mwifiex_private *priv, u8 *mac, u8 status) | 29 | const u8 *mac, u8 status) |
30 | { | 30 | { |
31 | struct mwifiex_ra_list_tbl *ra_list; | 31 | struct mwifiex_ra_list_tbl *ra_list; |
32 | struct list_head *tid_list; | 32 | struct list_head *tid_list; |
@@ -84,7 +84,8 @@ mwifiex_restore_tdls_packets(struct mwifiex_private *priv, u8 *mac, u8 status) | |||
84 | return; | 84 | return; |
85 | } | 85 | } |
86 | 86 | ||
87 | static void mwifiex_hold_tdls_packets(struct mwifiex_private *priv, u8 *mac) | 87 | static void mwifiex_hold_tdls_packets(struct mwifiex_private *priv, |
88 | const u8 *mac) | ||
88 | { | 89 | { |
89 | struct mwifiex_ra_list_tbl *ra_list; | 90 | struct mwifiex_ra_list_tbl *ra_list; |
90 | struct list_head *ra_list_head; | 91 | struct list_head *ra_list_head; |
@@ -186,7 +187,7 @@ static int mwifiex_tdls_add_vht_capab(struct mwifiex_private *priv, | |||
186 | } | 187 | } |
187 | 188 | ||
188 | static int mwifiex_tdls_add_vht_oper(struct mwifiex_private *priv, | 189 | static int mwifiex_tdls_add_vht_oper(struct mwifiex_private *priv, |
189 | u8 *mac, struct sk_buff *skb) | 190 | const u8 *mac, struct sk_buff *skb) |
190 | { | 191 | { |
191 | struct mwifiex_bssdescriptor *bss_desc; | 192 | struct mwifiex_bssdescriptor *bss_desc; |
192 | struct ieee80211_vht_operation *vht_oper; | 193 | struct ieee80211_vht_operation *vht_oper; |
@@ -325,8 +326,9 @@ static void mwifiex_tdls_add_qos_capab(struct sk_buff *skb) | |||
325 | } | 326 | } |
326 | 327 | ||
327 | static int mwifiex_prep_tdls_encap_data(struct mwifiex_private *priv, | 328 | static int mwifiex_prep_tdls_encap_data(struct mwifiex_private *priv, |
328 | u8 *peer, u8 action_code, u8 dialog_token, | 329 | const u8 *peer, u8 action_code, |
329 | u16 status_code, struct sk_buff *skb) | 330 | u8 dialog_token, |
331 | u16 status_code, struct sk_buff *skb) | ||
330 | { | 332 | { |
331 | struct ieee80211_tdls_data *tf; | 333 | struct ieee80211_tdls_data *tf; |
332 | int ret; | 334 | int ret; |
@@ -453,7 +455,8 @@ static int mwifiex_prep_tdls_encap_data(struct mwifiex_private *priv, | |||
453 | } | 455 | } |
454 | 456 | ||
455 | static void | 457 | static void |
456 | mwifiex_tdls_add_link_ie(struct sk_buff *skb, u8 *src_addr, u8 *peer, u8 *bssid) | 458 | mwifiex_tdls_add_link_ie(struct sk_buff *skb, const u8 *src_addr, |
459 | const u8 *peer, const u8 *bssid) | ||
457 | { | 460 | { |
458 | struct ieee80211_tdls_lnkie *lnkid; | 461 | struct ieee80211_tdls_lnkie *lnkid; |
459 | 462 | ||
@@ -467,8 +470,8 @@ mwifiex_tdls_add_link_ie(struct sk_buff *skb, u8 *src_addr, u8 *peer, u8 *bssid) | |||
467 | memcpy(lnkid->resp_sta, peer, ETH_ALEN); | 470 | memcpy(lnkid->resp_sta, peer, ETH_ALEN); |
468 | } | 471 | } |
469 | 472 | ||
470 | int mwifiex_send_tdls_data_frame(struct mwifiex_private *priv, | 473 | int mwifiex_send_tdls_data_frame(struct mwifiex_private *priv, const u8 *peer, |
471 | u8 *peer, u8 action_code, u8 dialog_token, | 474 | u8 action_code, u8 dialog_token, |
472 | u16 status_code, const u8 *extra_ies, | 475 | u16 status_code, const u8 *extra_ies, |
473 | size_t extra_ies_len) | 476 | size_t extra_ies_len) |
474 | { | 477 | { |
@@ -560,7 +563,8 @@ int mwifiex_send_tdls_data_frame(struct mwifiex_private *priv, | |||
560 | } | 563 | } |
561 | 564 | ||
562 | static int | 565 | static int |
563 | mwifiex_construct_tdls_action_frame(struct mwifiex_private *priv, u8 *peer, | 566 | mwifiex_construct_tdls_action_frame(struct mwifiex_private *priv, |
567 | const u8 *peer, | ||
564 | u8 action_code, u8 dialog_token, | 568 | u8 action_code, u8 dialog_token, |
565 | u16 status_code, struct sk_buff *skb) | 569 | u16 status_code, struct sk_buff *skb) |
566 | { | 570 | { |
@@ -638,10 +642,10 @@ mwifiex_construct_tdls_action_frame(struct mwifiex_private *priv, u8 *peer, | |||
638 | return 0; | 642 | return 0; |
639 | } | 643 | } |
640 | 644 | ||
641 | int mwifiex_send_tdls_action_frame(struct mwifiex_private *priv, | 645 | int mwifiex_send_tdls_action_frame(struct mwifiex_private *priv, const u8 *peer, |
642 | u8 *peer, u8 action_code, u8 dialog_token, | 646 | u8 action_code, u8 dialog_token, |
643 | u16 status_code, const u8 *extra_ies, | 647 | u16 status_code, const u8 *extra_ies, |
644 | size_t extra_ies_len) | 648 | size_t extra_ies_len) |
645 | { | 649 | { |
646 | struct sk_buff *skb; | 650 | struct sk_buff *skb; |
647 | struct mwifiex_txinfo *tx_info; | 651 | struct mwifiex_txinfo *tx_info; |
@@ -848,7 +852,7 @@ void mwifiex_process_tdls_action_frame(struct mwifiex_private *priv, | |||
848 | } | 852 | } |
849 | 853 | ||
850 | static int | 854 | static int |
851 | mwifiex_tdls_process_config_link(struct mwifiex_private *priv, u8 *peer) | 855 | mwifiex_tdls_process_config_link(struct mwifiex_private *priv, const u8 *peer) |
852 | { | 856 | { |
853 | struct mwifiex_sta_node *sta_ptr; | 857 | struct mwifiex_sta_node *sta_ptr; |
854 | struct mwifiex_ds_tdls_oper tdls_oper; | 858 | struct mwifiex_ds_tdls_oper tdls_oper; |
@@ -869,7 +873,7 @@ mwifiex_tdls_process_config_link(struct mwifiex_private *priv, u8 *peer) | |||
869 | } | 873 | } |
870 | 874 | ||
871 | static int | 875 | static int |
872 | mwifiex_tdls_process_create_link(struct mwifiex_private *priv, u8 *peer) | 876 | mwifiex_tdls_process_create_link(struct mwifiex_private *priv, const u8 *peer) |
873 | { | 877 | { |
874 | struct mwifiex_sta_node *sta_ptr; | 878 | struct mwifiex_sta_node *sta_ptr; |
875 | struct mwifiex_ds_tdls_oper tdls_oper; | 879 | struct mwifiex_ds_tdls_oper tdls_oper; |
@@ -896,7 +900,7 @@ mwifiex_tdls_process_create_link(struct mwifiex_private *priv, u8 *peer) | |||
896 | } | 900 | } |
897 | 901 | ||
898 | static int | 902 | static int |
899 | mwifiex_tdls_process_disable_link(struct mwifiex_private *priv, u8 *peer) | 903 | mwifiex_tdls_process_disable_link(struct mwifiex_private *priv, const u8 *peer) |
900 | { | 904 | { |
901 | struct mwifiex_sta_node *sta_ptr; | 905 | struct mwifiex_sta_node *sta_ptr; |
902 | struct mwifiex_ds_tdls_oper tdls_oper; | 906 | struct mwifiex_ds_tdls_oper tdls_oper; |
@@ -925,7 +929,7 @@ mwifiex_tdls_process_disable_link(struct mwifiex_private *priv, u8 *peer) | |||
925 | } | 929 | } |
926 | 930 | ||
927 | static int | 931 | static int |
928 | mwifiex_tdls_process_enable_link(struct mwifiex_private *priv, u8 *peer) | 932 | mwifiex_tdls_process_enable_link(struct mwifiex_private *priv, const u8 *peer) |
929 | { | 933 | { |
930 | struct mwifiex_sta_node *sta_ptr; | 934 | struct mwifiex_sta_node *sta_ptr; |
931 | struct ieee80211_mcs_info mcs; | 935 | struct ieee80211_mcs_info mcs; |
@@ -982,7 +986,7 @@ mwifiex_tdls_process_enable_link(struct mwifiex_private *priv, u8 *peer) | |||
982 | return 0; | 986 | return 0; |
983 | } | 987 | } |
984 | 988 | ||
985 | int mwifiex_tdls_oper(struct mwifiex_private *priv, u8 *peer, u8 action) | 989 | int mwifiex_tdls_oper(struct mwifiex_private *priv, const u8 *peer, u8 action) |
986 | { | 990 | { |
987 | switch (action) { | 991 | switch (action) { |
988 | case MWIFIEX_TDLS_ENABLE_LINK: | 992 | case MWIFIEX_TDLS_ENABLE_LINK: |
@@ -997,7 +1001,7 @@ int mwifiex_tdls_oper(struct mwifiex_private *priv, u8 *peer, u8 action) | |||
997 | return 0; | 1001 | return 0; |
998 | } | 1002 | } |
999 | 1003 | ||
1000 | int mwifiex_get_tdls_link_status(struct mwifiex_private *priv, u8 *mac) | 1004 | int mwifiex_get_tdls_link_status(struct mwifiex_private *priv, const u8 *mac) |
1001 | { | 1005 | { |
1002 | struct mwifiex_sta_node *sta_ptr; | 1006 | struct mwifiex_sta_node *sta_ptr; |
1003 | 1007 | ||
diff --git a/drivers/net/wireless/mwifiex/util.c b/drivers/net/wireless/mwifiex/util.c index c3824e37f3f2..6da5abf52e61 100644 --- a/drivers/net/wireless/mwifiex/util.c +++ b/drivers/net/wireless/mwifiex/util.c | |||
@@ -259,7 +259,7 @@ int mwifiex_complete_cmd(struct mwifiex_adapter *adapter, | |||
259 | * NULL is returned if station entry is not found in associated STA list. | 259 | * NULL is returned if station entry is not found in associated STA list. |
260 | */ | 260 | */ |
261 | struct mwifiex_sta_node * | 261 | struct mwifiex_sta_node * |
262 | mwifiex_get_sta_entry(struct mwifiex_private *priv, u8 *mac) | 262 | mwifiex_get_sta_entry(struct mwifiex_private *priv, const u8 *mac) |
263 | { | 263 | { |
264 | struct mwifiex_sta_node *node; | 264 | struct mwifiex_sta_node *node; |
265 | 265 | ||
@@ -280,7 +280,7 @@ mwifiex_get_sta_entry(struct mwifiex_private *priv, u8 *mac) | |||
280 | * If received mac address is NULL, NULL is returned. | 280 | * If received mac address is NULL, NULL is returned. |
281 | */ | 281 | */ |
282 | struct mwifiex_sta_node * | 282 | struct mwifiex_sta_node * |
283 | mwifiex_add_sta_entry(struct mwifiex_private *priv, u8 *mac) | 283 | mwifiex_add_sta_entry(struct mwifiex_private *priv, const u8 *mac) |
284 | { | 284 | { |
285 | struct mwifiex_sta_node *node; | 285 | struct mwifiex_sta_node *node; |
286 | unsigned long flags; | 286 | unsigned long flags; |
@@ -332,7 +332,7 @@ mwifiex_set_sta_ht_cap(struct mwifiex_private *priv, const u8 *ies, | |||
332 | } | 332 | } |
333 | 333 | ||
334 | /* This function will delete a station entry from station list */ | 334 | /* This function will delete a station entry from station list */ |
335 | void mwifiex_del_sta_entry(struct mwifiex_private *priv, u8 *mac) | 335 | void mwifiex_del_sta_entry(struct mwifiex_private *priv, const u8 *mac) |
336 | { | 336 | { |
337 | struct mwifiex_sta_node *node; | 337 | struct mwifiex_sta_node *node; |
338 | unsigned long flags; | 338 | unsigned long flags; |
diff --git a/drivers/net/wireless/mwifiex/wmm.c b/drivers/net/wireless/mwifiex/wmm.c index 0a7cc742aed7..c6bc5b3191d6 100644 --- a/drivers/net/wireless/mwifiex/wmm.c +++ b/drivers/net/wireless/mwifiex/wmm.c | |||
@@ -92,7 +92,7 @@ mwifiex_wmm_ac_debug_print(const struct ieee_types_wmm_ac_parameters *ac_param) | |||
92 | * The function also initializes the list with the provided RA. | 92 | * The function also initializes the list with the provided RA. |
93 | */ | 93 | */ |
94 | static struct mwifiex_ra_list_tbl * | 94 | static struct mwifiex_ra_list_tbl * |
95 | mwifiex_wmm_allocate_ralist_node(struct mwifiex_adapter *adapter, u8 *ra) | 95 | mwifiex_wmm_allocate_ralist_node(struct mwifiex_adapter *adapter, const u8 *ra) |
96 | { | 96 | { |
97 | struct mwifiex_ra_list_tbl *ra_list; | 97 | struct mwifiex_ra_list_tbl *ra_list; |
98 | 98 | ||
@@ -139,8 +139,7 @@ static u8 mwifiex_get_random_ba_threshold(void) | |||
139 | * This function allocates and adds a RA list for all TIDs | 139 | * This function allocates and adds a RA list for all TIDs |
140 | * with the given RA. | 140 | * with the given RA. |
141 | */ | 141 | */ |
142 | void | 142 | void mwifiex_ralist_add(struct mwifiex_private *priv, const u8 *ra) |
143 | mwifiex_ralist_add(struct mwifiex_private *priv, u8 *ra) | ||
144 | { | 143 | { |
145 | int i; | 144 | int i; |
146 | struct mwifiex_ra_list_tbl *ra_list; | 145 | struct mwifiex_ra_list_tbl *ra_list; |
@@ -575,7 +574,7 @@ mwifiex_clean_txrx(struct mwifiex_private *priv) | |||
575 | */ | 574 | */ |
576 | static struct mwifiex_ra_list_tbl * | 575 | static struct mwifiex_ra_list_tbl * |
577 | mwifiex_wmm_get_ralist_node(struct mwifiex_private *priv, u8 tid, | 576 | mwifiex_wmm_get_ralist_node(struct mwifiex_private *priv, u8 tid, |
578 | u8 *ra_addr) | 577 | const u8 *ra_addr) |
579 | { | 578 | { |
580 | struct mwifiex_ra_list_tbl *ra_list; | 579 | struct mwifiex_ra_list_tbl *ra_list; |
581 | 580 | ||
@@ -596,7 +595,8 @@ mwifiex_wmm_get_ralist_node(struct mwifiex_private *priv, u8 tid, | |||
596 | * retrieved. | 595 | * retrieved. |
597 | */ | 596 | */ |
598 | struct mwifiex_ra_list_tbl * | 597 | struct mwifiex_ra_list_tbl * |
599 | mwifiex_wmm_get_queue_raptr(struct mwifiex_private *priv, u8 tid, u8 *ra_addr) | 598 | mwifiex_wmm_get_queue_raptr(struct mwifiex_private *priv, u8 tid, |
599 | const u8 *ra_addr) | ||
600 | { | 600 | { |
601 | struct mwifiex_ra_list_tbl *ra_list; | 601 | struct mwifiex_ra_list_tbl *ra_list; |
602 | 602 | ||
diff --git a/drivers/net/wireless/mwifiex/wmm.h b/drivers/net/wireless/mwifiex/wmm.h index 83e42083ebff..eca56e371a57 100644 --- a/drivers/net/wireless/mwifiex/wmm.h +++ b/drivers/net/wireless/mwifiex/wmm.h | |||
@@ -99,7 +99,7 @@ mwifiex_wmm_is_ra_list_empty(struct list_head *ra_list_hhead) | |||
99 | 99 | ||
100 | void mwifiex_wmm_add_buf_txqueue(struct mwifiex_private *priv, | 100 | void mwifiex_wmm_add_buf_txqueue(struct mwifiex_private *priv, |
101 | struct sk_buff *skb); | 101 | struct sk_buff *skb); |
102 | void mwifiex_ralist_add(struct mwifiex_private *priv, u8 *ra); | 102 | void mwifiex_ralist_add(struct mwifiex_private *priv, const u8 *ra); |
103 | void mwifiex_rotate_priolists(struct mwifiex_private *priv, | 103 | void mwifiex_rotate_priolists(struct mwifiex_private *priv, |
104 | struct mwifiex_ra_list_tbl *ra, int tid); | 104 | struct mwifiex_ra_list_tbl *ra, int tid); |
105 | 105 | ||
@@ -123,7 +123,8 @@ void mwifiex_wmm_setup_ac_downgrade(struct mwifiex_private *priv); | |||
123 | int mwifiex_ret_wmm_get_status(struct mwifiex_private *priv, | 123 | int mwifiex_ret_wmm_get_status(struct mwifiex_private *priv, |
124 | const struct host_cmd_ds_command *resp); | 124 | const struct host_cmd_ds_command *resp); |
125 | struct mwifiex_ra_list_tbl * | 125 | struct mwifiex_ra_list_tbl * |
126 | mwifiex_wmm_get_queue_raptr(struct mwifiex_private *priv, u8 tid, u8 *ra_addr); | 126 | mwifiex_wmm_get_queue_raptr(struct mwifiex_private *priv, u8 tid, |
127 | const u8 *ra_addr); | ||
127 | u8 mwifiex_wmm_downgrade_tid(struct mwifiex_private *priv, u32 tid); | 128 | u8 mwifiex_wmm_downgrade_tid(struct mwifiex_private *priv, u32 tid); |
128 | 129 | ||
129 | #endif /* !_MWIFIEX_WMM_H_ */ | 130 | #endif /* !_MWIFIEX_WMM_H_ */ |
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index 39d22a154341..d2a9a08210be 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c | |||
@@ -517,7 +517,7 @@ static int rndis_set_default_key(struct wiphy *wiphy, struct net_device *netdev, | |||
517 | u8 key_index, bool unicast, bool multicast); | 517 | u8 key_index, bool unicast, bool multicast); |
518 | 518 | ||
519 | static int rndis_get_station(struct wiphy *wiphy, struct net_device *dev, | 519 | static int rndis_get_station(struct wiphy *wiphy, struct net_device *dev, |
520 | u8 *mac, struct station_info *sinfo); | 520 | const u8 *mac, struct station_info *sinfo); |
521 | 521 | ||
522 | static int rndis_dump_station(struct wiphy *wiphy, struct net_device *dev, | 522 | static int rndis_dump_station(struct wiphy *wiphy, struct net_device *dev, |
523 | int idx, u8 *mac, struct station_info *sinfo); | 523 | int idx, u8 *mac, struct station_info *sinfo); |
@@ -2490,7 +2490,7 @@ static void rndis_fill_station_info(struct usbnet *usbdev, | |||
2490 | } | 2490 | } |
2491 | 2491 | ||
2492 | static int rndis_get_station(struct wiphy *wiphy, struct net_device *dev, | 2492 | static int rndis_get_station(struct wiphy *wiphy, struct net_device *dev, |
2493 | u8 *mac, struct station_info *sinfo) | 2493 | const u8 *mac, struct station_info *sinfo) |
2494 | { | 2494 | { |
2495 | struct rndis_wlan_private *priv = wiphy_priv(wiphy); | 2495 | struct rndis_wlan_private *priv = wiphy_priv(wiphy); |
2496 | struct usbnet *usbdev = priv->usbdev; | 2496 | struct usbnet *usbdev = priv->usbdev; |
diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c index f76f95c29617..f7eb8163d4fb 100644 --- a/drivers/staging/wlan-ng/cfg80211.c +++ b/drivers/staging/wlan-ng/cfg80211.c | |||
@@ -298,7 +298,7 @@ static int prism2_set_default_key(struct wiphy *wiphy, struct net_device *dev, | |||
298 | 298 | ||
299 | 299 | ||
300 | static int prism2_get_station(struct wiphy *wiphy, struct net_device *dev, | 300 | static int prism2_get_station(struct wiphy *wiphy, struct net_device *dev, |
301 | u8 *mac, struct station_info *sinfo) | 301 | const u8 *mac, struct station_info *sinfo) |
302 | { | 302 | { |
303 | wlandevice_t *wlandev = dev->ml_priv; | 303 | wlandevice_t *wlandev = dev->ml_priv; |
304 | struct p80211msg_lnxreq_commsquality quality; | 304 | struct p80211msg_lnxreq_commsquality quality; |