Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a47cea7 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: make cfg80211 ops and privid const 



The wiphy privid (to identify wiphys) and the cfg80211
ops should both be const, so change them to be.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 631ad703

net/mac80211/cfg.c

+1 −1
Original line number Diff line number Diff line
@@ -3918,7 +3918,7 @@ static int ieee80211_set_qos_map(struct wiphy *wiphy, 
	return 0;

}



struct cfg80211_ops mac80211_config_ops = {

const struct cfg80211_ops mac80211_config_ops = {

	.add_virtual_intf = ieee80211_add_iface,

	.del_virtual_intf = ieee80211_del_iface,

	.change_virtual_intf = ieee80211_change_iface,

net/mac80211/cfg.h

+1 −1
Original line number Diff line number Diff line
@@ -4,6 +4,6 @@ 
#ifndef __CFG_H

#define __CFG_H



extern struct cfg80211_ops mac80211_config_ops;

extern const struct cfg80211_ops mac80211_config_ops;



#endif /* __CFG_H */

net/mac80211/ieee80211_i.h

+1 −1
Original line number Diff line number Diff line
@@ -1608,7 +1608,7 @@ static inline int __ieee80211_resume(struct ieee80211_hw *hw) 
}



/* utility functions/constants */

extern void *mac80211_wiphy_privid; /* for wiphy privid */

extern const void *const mac80211_wiphy_privid; /* for wiphy privid */

u8 *ieee80211_get_bssid(struct ieee80211_hdr *hdr, size_t len,

			enum nl80211_iftype type);

int ieee80211_frame_duration(enum ieee80211_band band, size_t len,

net/mac80211/util.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include "wep.h"



/* privid for wiphys to determine whether they belong to us or not */

void *mac80211_wiphy_privid = &mac80211_wiphy_privid;

const void *const mac80211_wiphy_privid = &mac80211_wiphy_privid;



struct ieee80211_hw *wiphy_to_ieee80211_hw(struct wiphy *wiphy)

{