Jelajahi Sumber

mac80211: constify ieee80211_if_conf.bssid

Then one place can be a static const.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Johannes Berg 16 tahun lalu
induk
melakukan
5f936f1161

+ 1 - 1
drivers/net/wireless/libertas_tf/cmd.c

@@ -286,7 +286,7 @@ void lbtf_set_mode(struct lbtf_private *priv, enum lbtf_mode mode)
 	lbtf_cmd_async(priv, CMD_802_11_SET_MODE, &cmd.hdr, sizeof(cmd));
 	lbtf_cmd_async(priv, CMD_802_11_SET_MODE, &cmd.hdr, sizeof(cmd));
 }
 }
 
 
-void lbtf_set_bssid(struct lbtf_private *priv, bool activate, u8 *bssid)
+void lbtf_set_bssid(struct lbtf_private *priv, bool activate, const u8 *bssid)
 {
 {
 	struct cmd_ds_set_bssid cmd;
 	struct cmd_ds_set_bssid cmd;
 
 

+ 1 - 1
drivers/net/wireless/libertas_tf/libertas_tf.h

@@ -463,7 +463,7 @@ int lbtf_set_radio_control(struct lbtf_private *priv);
 int lbtf_update_hw_spec(struct lbtf_private *priv);
 int lbtf_update_hw_spec(struct lbtf_private *priv);
 int lbtf_cmd_set_mac_multicast_addr(struct lbtf_private *priv);
 int lbtf_cmd_set_mac_multicast_addr(struct lbtf_private *priv);
 void lbtf_set_mode(struct lbtf_private *priv, enum lbtf_mode mode);
 void lbtf_set_mode(struct lbtf_private *priv, enum lbtf_mode mode);
-void lbtf_set_bssid(struct lbtf_private *priv, bool activate, u8 *bssid);
+void lbtf_set_bssid(struct lbtf_private *priv, bool activate, const u8 *bssid);
 int lbtf_set_mac_address(struct lbtf_private *priv, uint8_t *mac_addr);
 int lbtf_set_mac_address(struct lbtf_private *priv, uint8_t *mac_addr);
 
 
 int lbtf_set_channel(struct lbtf_private *priv, u8 channel);
 int lbtf_set_channel(struct lbtf_private *priv, u8 channel);

+ 1 - 1
drivers/net/wireless/rt2x00/rt2x00config.c

@@ -32,7 +32,7 @@
 void rt2x00lib_config_intf(struct rt2x00_dev *rt2x00dev,
 void rt2x00lib_config_intf(struct rt2x00_dev *rt2x00dev,
 			   struct rt2x00_intf *intf,
 			   struct rt2x00_intf *intf,
 			   enum nl80211_iftype type,
 			   enum nl80211_iftype type,
-			   u8 *mac, u8 *bssid)
+			   const u8 *mac, const u8 *bssid)
 {
 {
 	struct rt2x00intf_conf conf;
 	struct rt2x00intf_conf conf;
 	unsigned int flags = 0;
 	unsigned int flags = 0;

+ 1 - 1
drivers/net/wireless/rt2x00/rt2x00lib.h

@@ -76,7 +76,7 @@ void rt2x00lib_stop(struct rt2x00_dev *rt2x00dev);
 void rt2x00lib_config_intf(struct rt2x00_dev *rt2x00dev,
 void rt2x00lib_config_intf(struct rt2x00_dev *rt2x00dev,
 			   struct rt2x00_intf *intf,
 			   struct rt2x00_intf *intf,
 			   enum nl80211_iftype type,
 			   enum nl80211_iftype type,
-			   u8 *mac, u8 *bssid);
+			   const u8 *mac, const u8 *bssid);
 void rt2x00lib_config_erp(struct rt2x00_dev *rt2x00dev,
 void rt2x00lib_config_erp(struct rt2x00_dev *rt2x00dev,
 			  struct rt2x00_intf *intf,
 			  struct rt2x00_intf *intf,
 			  struct ieee80211_bss_conf *conf);
 			  struct ieee80211_bss_conf *conf);

+ 1 - 1
include/net/mac80211.h

@@ -643,7 +643,7 @@ enum ieee80211_if_conf_change {
  */
  */
 struct ieee80211_if_conf {
 struct ieee80211_if_conf {
 	u32 changed;
 	u32 changed;
-	u8 *bssid;
+	const u8 *bssid;
 };
 };
 
 
 /**
 /**

+ 1 - 1
net/mac80211/main.c

@@ -176,7 +176,7 @@ int ieee80211_if_config(struct ieee80211_sub_if_data *sdata, u32 changed)
 	else if (sdata->vif.type == NL80211_IFTYPE_AP)
 	else if (sdata->vif.type == NL80211_IFTYPE_AP)
 		conf.bssid = sdata->dev->dev_addr;
 		conf.bssid = sdata->dev->dev_addr;
 	else if (ieee80211_vif_is_mesh(&sdata->vif)) {
 	else if (ieee80211_vif_is_mesh(&sdata->vif)) {
-		u8 zero[ETH_ALEN] = { 0 };
+		static const u8 zero[ETH_ALEN] = { 0 };
 		conf.bssid = zero;
 		conf.bssid = zero;
 	} else {
 	} else {
 		WARN_ON(1);
 		WARN_ON(1);