wireless: use __aligned

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

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 1f74360b527c449aa3ef0ab31fc388438ba0a284..e5f085c8922116b16019eb1d03cd4d9e0ec67ba3 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -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)

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index a464f4fb36a004e7a77838de8d1e253ca6bb5f11..23daed3c78edc48b03be38e8f06de6735172078e 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -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 *));
 };
 
 /**

diff --git a/net/wireless/core.h b/net/wireless/core.h
index b8f4630c6ada34cae35ddad13ef45a96a7a30af9..f342267e36207969b3dba3bfc071bc440082268e 100644 (file)
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -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