lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wireless: use __aligned

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

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg
2012-12-28 12:22:02 +01:00
parent ec61cd63dd
commit 1c06ef9831
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/cfg80211.h
View File

@@ -1256,7 +1256,7 @@ struct cfg80211_bss {
u8 bssid[ETH_ALEN]; 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; const struct iw_handler_def *wext;
#endif #endif
char priv[0] __attribute__((__aligned__(NETDEV_ALIGN))); char priv[0] __aligned(NETDEV_ALIGN);
}; };
static inline struct net *wiphy_net(struct wiphy *wiphy) static inline struct net *wiphy_net(struct wiphy *wiphy)

6
include/net/mac80211.h
View File

@@ -173,7 +173,7 @@ struct ieee80211_chanctx_conf {
u8 rx_chains_static, rx_chains_dynamic; 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; u32 driver_flags;
/* must be last */ /* 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) static inline bool ieee80211_vif_is_mesh(struct ieee80211_vif *vif)
@@ -1209,7 +1209,7 @@ struct ieee80211_sta {
u8 max_sp; u8 max_sp;
/* must be last */ /* must be last */
u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *)))); u8 drv_priv[0] __aligned(sizeof(void *));
}; };
/** /**

2
net/wireless/core.h
View File

@@ -89,7 +89,7 @@ struct cfg80211_registered_device {
/* must be last because of the way we do wiphy_priv(), /* must be last because of the way we do wiphy_priv(),
* and it should at least be aligned to NETDEV_ALIGN */ * 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 static inline