diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-09-19 03:26:06 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-09-19 03:32:59 -0400 |
commit | 552bff0c2fec8953ba3793d75ee335032cc0b47c (patch) | |
tree | 266f60e039d9869b408275384392c9643e35528b | |
parent | 2ad4814fb6ddc78ec17079b5dec9e2cd313a944c (diff) |
cfg80211: constify name parameter to add_virtual_intf
The name can't be modified by the driver,
make it const.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/cfg80211.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/cfg80211.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/cfg80211.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/main.h | 2 | ||||
-rw-r--r-- | include/net/cfg80211.h | 2 | ||||
-rw-r--r-- | net/mac80211/cfg.c | 3 |
6 files changed, 8 insertions, 7 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c index 86aeef4b9d7e..7089f8160ad5 100644 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c | |||
@@ -1488,7 +1488,7 @@ static int ath6kl_cfg80211_set_power_mgmt(struct wiphy *wiphy, | |||
1488 | } | 1488 | } |
1489 | 1489 | ||
1490 | static struct wireless_dev *ath6kl_cfg80211_add_iface(struct wiphy *wiphy, | 1490 | static struct wireless_dev *ath6kl_cfg80211_add_iface(struct wiphy *wiphy, |
1491 | char *name, | 1491 | const char *name, |
1492 | enum nl80211_iftype type, | 1492 | enum nl80211_iftype type, |
1493 | u32 *flags, | 1493 | u32 *flags, |
1494 | struct vif_params *params) | 1494 | struct vif_params *params) |
@@ -3477,7 +3477,7 @@ void ath6kl_cfg80211_vif_cleanup(struct ath6kl_vif *vif) | |||
3477 | ar->num_vif--; | 3477 | ar->num_vif--; |
3478 | } | 3478 | } |
3479 | 3479 | ||
3480 | struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, char *name, | 3480 | struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, const char *name, |
3481 | enum nl80211_iftype type, | 3481 | enum nl80211_iftype type, |
3482 | u8 fw_vif_idx, u8 nw_type) | 3482 | u8 fw_vif_idx, u8 nw_type) |
3483 | { | 3483 | { |
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.h b/drivers/net/wireless/ath/ath6kl/cfg80211.h index 56b1ebe79812..780f77775a91 100644 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.h +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.h | |||
@@ -25,7 +25,7 @@ enum ath6kl_cfg_suspend_mode { | |||
25 | ATH6KL_CFG_SUSPEND_SCHED_SCAN, | 25 | ATH6KL_CFG_SUSPEND_SCHED_SCAN, |
26 | }; | 26 | }; |
27 | 27 | ||
28 | struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, char *name, | 28 | struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, const char *name, |
29 | enum nl80211_iftype type, | 29 | enum nl80211_iftype type, |
30 | u8 fw_vif_idx, u8 nw_type); | 30 | u8 fw_vif_idx, u8 nw_type); |
31 | void ath6kl_cfg80211_ch_switch_notify(struct ath6kl_vif *vif, int freq, | 31 | void ath6kl_cfg80211_ch_switch_notify(struct ath6kl_vif *vif, int freq, |
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c index e57f543413de..49e20661b60b 100644 --- a/drivers/net/wireless/mwifiex/cfg80211.c +++ b/drivers/net/wireless/mwifiex/cfg80211.c | |||
@@ -1597,7 +1597,7 @@ mwifiex_setup_ht_caps(struct ieee80211_sta_ht_cap *ht_info, | |||
1597 | * create a new virtual interface with the given name | 1597 | * create a new virtual interface with the given name |
1598 | */ | 1598 | */ |
1599 | struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy, | 1599 | struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy, |
1600 | char *name, | 1600 | const char *name, |
1601 | enum nl80211_iftype type, | 1601 | enum nl80211_iftype type, |
1602 | u32 *flags, | 1602 | u32 *flags, |
1603 | struct vif_params *params) | 1603 | struct vif_params *params) |
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h index 994bc4fc263e..d2fb3c3e1db1 100644 --- a/drivers/net/wireless/mwifiex/main.h +++ b/drivers/net/wireless/mwifiex/main.h | |||
@@ -1030,7 +1030,7 @@ int mwifiex_check_network_compatibility(struct mwifiex_private *priv, | |||
1030 | struct mwifiex_bssdescriptor *bss_desc); | 1030 | struct mwifiex_bssdescriptor *bss_desc); |
1031 | 1031 | ||
1032 | struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy, | 1032 | struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy, |
1033 | char *name, | 1033 | const char *name, |
1034 | enum nl80211_iftype type, | 1034 | enum nl80211_iftype type, |
1035 | u32 *flags, | 1035 | u32 *flags, |
1036 | struct vif_params *params); | 1036 | struct vif_params *params); |
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 80051ffc2755..ab78b53bd6f5 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h | |||
@@ -1628,7 +1628,7 @@ struct cfg80211_ops { | |||
1628 | void (*set_wakeup)(struct wiphy *wiphy, bool enabled); | 1628 | void (*set_wakeup)(struct wiphy *wiphy, bool enabled); |
1629 | 1629 | ||
1630 | struct wireless_dev * (*add_virtual_intf)(struct wiphy *wiphy, | 1630 | struct wireless_dev * (*add_virtual_intf)(struct wiphy *wiphy, |
1631 | char *name, | 1631 | const char *name, |
1632 | enum nl80211_iftype type, | 1632 | enum nl80211_iftype type, |
1633 | u32 *flags, | 1633 | u32 *flags, |
1634 | struct vif_params *params); | 1634 | struct vif_params *params); |
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 9bd56a744982..05f3a313db88 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c | |||
@@ -20,7 +20,8 @@ | |||
20 | #include "rate.h" | 20 | #include "rate.h" |
21 | #include "mesh.h" | 21 | #include "mesh.h" |
22 | 22 | ||
23 | static struct wireless_dev *ieee80211_add_iface(struct wiphy *wiphy, char *name, | 23 | static struct wireless_dev *ieee80211_add_iface(struct wiphy *wiphy, |
24 | const char *name, | ||
24 | enum nl80211_iftype type, | 25 | enum nl80211_iftype type, |
25 | u32 *flags, | 26 | u32 *flags, |
26 | struct vif_params *params) | 27 | struct vif_params *params) |