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

Commit 1c06ef98 authored by Johannes Berg's avatar Johannes Berg
Browse files

wireless: use __aligned 



Use __aligned(...) instead of __attribute__((aligned(...)))
in mac80211 and cfg80211.

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

include/net/cfg80211.h

+2 −2
Original line number Diff line number Diff line
@@ -1256,7 +1256,7 @@ struct cfg80211_bss { 


	u8 bssid[ETH_ALEN];



	u8 priv[0] __attribute__((__aligned__(sizeof(void *))));

	u8 priv[0] __aligned(sizeof(void *));

};



/**
@@ -2392,7 +2392,7 @@ struct wiphy { 
	const struct iw_handler_def *wext;

#endif



	char priv[0] __attribute__((__aligned__(NETDEV_ALIGN)));

	char priv[0] __aligned(NETDEV_ALIGN);

};



static inline struct net *wiphy_net(struct wiphy *wiphy)

include/net/mac80211.h

+3 −3
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ struct ieee80211_chanctx_conf { 


	u8 rx_chains_static, rx_chains_dynamic;



	u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *))));

	u8 drv_priv[0] __aligned(sizeof(void *));

};



/**
@@ -1059,7 +1059,7 @@ struct ieee80211_vif { 
	u32 driver_flags;



	/* must be last */

	u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *))));

	u8 drv_priv[0] __aligned(sizeof(void *));

};



static inline bool ieee80211_vif_is_mesh(struct ieee80211_vif *vif)
@@ -1209,7 +1209,7 @@ struct ieee80211_sta { 
	u8 max_sp;



	/* must be last */

	u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *))));

	u8 drv_priv[0] __aligned(sizeof(void *));

};



/**

net/wireless/core.h

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ struct cfg80211_registered_device { 


	/* must be last because of the way we do wiphy_priv(),

	 * and it should at least be aligned to NETDEV_ALIGN */

	struct wiphy wiphy __attribute__((__aligned__(NETDEV_ALIGN)));

	struct wiphy wiphy __aligned(NETDEV_ALIGN);

};



static inline