aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-05-09 14:06:47 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-05-11 15:24:07 -0400
commit4e943900fb9675d3a5ebdabc2cd4a9a54edace97 (patch)
tree72b6492d01dffa834133c0cdbd52ce4b65392332
parent8fbff4b838c53945d6baeafe609c627000f85cd6 (diff)
cfg80211: constify key mac address in ops
The address pointed to by mac_addr can be marked as const. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--include/net/cfg80211.h6
-rw-r--r--net/mac80211/cfg.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 47e30e1d91fe..35afe973d46b 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -860,13 +860,13 @@ struct cfg80211_ops {
860 struct vif_params *params); 860 struct vif_params *params);
861 861
862 int (*add_key)(struct wiphy *wiphy, struct net_device *netdev, 862 int (*add_key)(struct wiphy *wiphy, struct net_device *netdev,
863 u8 key_index, u8 *mac_addr, 863 u8 key_index, const u8 *mac_addr,
864 struct key_params *params); 864 struct key_params *params);
865 int (*get_key)(struct wiphy *wiphy, struct net_device *netdev, 865 int (*get_key)(struct wiphy *wiphy, struct net_device *netdev,
866 u8 key_index, u8 *mac_addr, void *cookie, 866 u8 key_index, const u8 *mac_addr, void *cookie,
867 void (*callback)(void *cookie, struct key_params*)); 867 void (*callback)(void *cookie, struct key_params*));
868 int (*del_key)(struct wiphy *wiphy, struct net_device *netdev, 868 int (*del_key)(struct wiphy *wiphy, struct net_device *netdev,
869 u8 key_index, u8 *mac_addr); 869 u8 key_index, const u8 *mac_addr);
870 int (*set_default_key)(struct wiphy *wiphy, 870 int (*set_default_key)(struct wiphy *wiphy,
871 struct net_device *netdev, 871 struct net_device *netdev,
872 u8 key_index); 872 u8 key_index);
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 4e627cf2b8c1..be86e159e6ef 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -112,7 +112,7 @@ static int ieee80211_change_iface(struct wiphy *wiphy, int ifindex,
112} 112}
113 113
114static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev, 114static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev,
115 u8 key_idx, u8 *mac_addr, 115 u8 key_idx, const u8 *mac_addr,
116 struct key_params *params) 116 struct key_params *params)
117{ 117{
118 struct ieee80211_sub_if_data *sdata; 118 struct ieee80211_sub_if_data *sdata;
@@ -166,7 +166,7 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev,
166} 166}
167 167
168static int ieee80211_del_key(struct wiphy *wiphy, struct net_device *dev, 168static int ieee80211_del_key(struct wiphy *wiphy, struct net_device *dev,
169 u8 key_idx, u8 *mac_addr) 169 u8 key_idx, const u8 *mac_addr)
170{ 170{
171 struct ieee80211_sub_if_data *sdata; 171 struct ieee80211_sub_if_data *sdata;
172 struct sta_info *sta; 172 struct sta_info *sta;
@@ -208,7 +208,7 @@ static int ieee80211_del_key(struct wiphy *wiphy, struct net_device *dev,
208} 208}
209 209
210static int ieee80211_get_key(struct wiphy *wiphy, struct net_device *dev, 210static int ieee80211_get_key(struct wiphy *wiphy, struct net_device *dev,
211 u8 key_idx, u8 *mac_addr, void *cookie, 211 u8 key_idx, const u8 *mac_addr, void *cookie,
212 void (*callback)(void *cookie, 212 void (*callback)(void *cookie,
213 struct key_params *params)) 213 struct key_params *params))
214{ 214{