Commit 4e943900 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

cfg80211: constify key mac address in ops 



The address pointed to by mac_addr can be marked as const.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8fbff4b8

include/net/cfg80211.h

+3 −3
Original line number Diff line number Diff line
@@ -860,13 +860,13 @@ struct cfg80211_ops { 
				       struct vif_params *params);



	int	(*add_key)(struct wiphy *wiphy, struct net_device *netdev,

			   u8 key_index, u8 *mac_addr,

			   u8 key_index, const u8 *mac_addr,

			   struct key_params *params);

	int	(*get_key)(struct wiphy *wiphy, struct net_device *netdev,

			   u8 key_index, u8 *mac_addr, void *cookie,

			   u8 key_index, const u8 *mac_addr, void *cookie,

			   void (*callback)(void *cookie, struct key_params*));

	int	(*del_key)(struct wiphy *wiphy, struct net_device *netdev,

			   u8 key_index, u8 *mac_addr);

			   u8 key_index, const u8 *mac_addr);

	int	(*set_default_key)(struct wiphy *wiphy,

				   struct net_device *netdev,

				   u8 key_index);

net/mac80211/cfg.c

+3 −3
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static int ieee80211_change_iface(struct wiphy *wiphy, int ifindex, 
}



static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev,

			     u8 key_idx, u8 *mac_addr,

			     u8 key_idx, const u8 *mac_addr,

			     struct key_params *params)

{

	struct ieee80211_sub_if_data *sdata;
@@ -166,7 +166,7 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev, 
}



static int ieee80211_del_key(struct wiphy *wiphy, struct net_device *dev,

			     u8 key_idx, u8 *mac_addr)

			     u8 key_idx, const u8 *mac_addr)

{

	struct ieee80211_sub_if_data *sdata;

	struct sta_info *sta;
@@ -208,7 +208,7 @@ static int ieee80211_del_key(struct wiphy *wiphy, struct net_device *dev, 
}



static int ieee80211_get_key(struct wiphy *wiphy, struct net_device *dev,

			     u8 key_idx, u8 *mac_addr, void *cookie,

			     u8 key_idx, const u8 *mac_addr, void *cookie,

			     void (*callback)(void *cookie,

					      struct key_params *params))

{