net: ALIGN/PTR_ALIGN cleanup in alloc_netdev_mq()/netdev_priv()

Use ALIGN() and PTR_ALIGN() macros instead of handcoding them.

Get rid of NETDEV_ALIGN_CONST ugly define

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 6 deletions

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 6b7e92eaab47..e37770ced53c 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -735,9 +735,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
          * +-------------------------+
          *
          */
-        priv_size = ((sizeof(struct ieee80211_local) +
-                      NETDEV_ALIGN_CONST) & ~NETDEV_ALIGN_CONST) +
-                    priv_data_len;
+        priv_size = ALIGN(sizeof(*local), NETDEV_ALIGN) + priv_data_len;
 
         wiphy = wiphy_new(&mac80211_config_ops, priv_size);
 
@@ -754,9 +752,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
 
         local->hw.wiphy = wiphy;
 
-        local->hw.priv = (char *)local +
-                         ((sizeof(struct ieee80211_local) +
-                           NETDEV_ALIGN_CONST) & ~NETDEV_ALIGN_CONST);
+        local->hw.priv = (char *)local + ALIGN(sizeof(*local), NETDEV_ALIGN);
 
         BUG_ON(!ops->tx);
         BUG_ON(!ops->start);