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>

diff --git a/drivers/net/wireless/libertas_tf/cmd.c b/drivers/net/wireless/libertas_tf/cmd.c
index 3d3914c83b145388c6d2afc6c6c6fc124f8b2469..28790e03dc43ef797a2150d9cbb48a1afdf99a76 100644 (file)
--- a/drivers/net/wireless/libertas_tf/cmd.c
+++ b/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));
 }
 
-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;
 

diff --git a/drivers/net/wireless/libertas_tf/libertas_tf.h b/drivers/net/wireless/libertas_tf/libertas_tf.h
index 8995cd7c29bf4ce1ef15cc95c5e614a43e456f4a..4cc42dd5a005258f10055bcaae3e61617e3bb2e9 100644 (file)
--- a/drivers/net/wireless/libertas_tf/libertas_tf.h
+++ b/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_cmd_set_mac_multicast_addr(struct lbtf_private *priv);
 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_channel(struct lbtf_private *priv, u8 channel);

diff --git a/drivers/net/wireless/rt2x00/rt2x00config.c b/drivers/net/wireless/rt2x00/rt2x00config.c
index 6b3bb0f661d5ef0d36a9baf9f3cba603bf4e299a..9c2f5517af2a453784dc8cd6e96a92279ff6311d 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00config.c
+++ b/drivers/net/wireless/rt2x00/rt2x00config.c
@@ -32,7 +32,7 @@
 void rt2x00lib_config_intf(struct rt2x00_dev *rt2x00dev,
                           struct rt2x00_intf *intf,
                           enum nl80211_iftype type,
-                          u8 *mac, u8 *bssid)
+                          const u8 *mac, const u8 *bssid)
 {
        struct rt2x00intf_conf conf;
        unsigned int flags = 0;

diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h b/drivers/net/wireless/rt2x00/rt2x00lib.h
index daf0def915ddd28e00fc4c86dc874d4b8ebc4225..34efe46535491ca1515473a6a6f92d11e8eb11b8 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00lib.h
+++ b/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,
                           struct rt2x00_intf *intf,
                           enum nl80211_iftype type,
-                          u8 *mac, u8 *bssid);
+                          const u8 *mac, const u8 *bssid);
 void rt2x00lib_config_erp(struct rt2x00_dev *rt2x00dev,
                          struct rt2x00_intf *intf,
                          struct ieee80211_bss_conf *conf);

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 9a5869e9ecfacbf03d21c59a2d00c09159dcd5ec..ef42559694f1f4a67e4b2996dfbf2166a2b7d61c 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -643,7 +643,7 @@ enum ieee80211_if_conf_change {
  */
 struct ieee80211_if_conf {
        u32 changed;
-       u8 *bssid;
+       const u8 *bssid;
 };
 
 /**

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index c78304db475e4dd1ebebe0cd5e89f66d9dccd7bb..6f0fe3564ca41cef66a802185a5ec5a6a8e86d34 100644 (file)
--- a/net/mac80211/main.c
+++ b/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)
                conf.bssid = sdata->dev->dev_addr;
        else if (ieee80211_vif_is_mesh(&sdata->vif)) {
-               u8 zero[ETH_ALEN] = { 0 };
+               static const u8 zero[ETH_ALEN] = { 0 };
                conf.bssid = zero;
        } else {
                WARN_ON(1);