2 files changed, 6 insertions, 11 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index ed4550fd9ece..32ceee17896e 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4988,18 +4988,18 @@ struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name,
         struct netdev_queue *tx;
         struct net_device *dev;
         size_t alloc_size;
-        void *p;
+        struct net_device *p;
 
         BUG_ON(strlen(name) >= sizeof(dev->name));
 
         alloc_size = sizeof(struct net_device);
         if (sizeof_priv) {
                 /* ensure 32-byte alignment of private area */
-                alloc_size = (alloc_size + NETDEV_ALIGN_CONST) & ~NETDEV_ALIGN_CONST;
+                alloc_size = ALIGN(alloc_size, NETDEV_ALIGN);
                 alloc_size += sizeof_priv;
         }
         /* ensure 32-byte alignment of whole construct */
-        alloc_size += NETDEV_ALIGN_CONST;
+        alloc_size += NETDEV_ALIGN - 1;
 
         p = kzalloc(alloc_size, GFP_KERNEL);
         if (!p) {
@@ -5014,8 +5014,7 @@ struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name,
                 goto free_p;
         }
 
-        dev = (struct net_device *)
-                (((long)p + NETDEV_ALIGN_CONST) & ~NETDEV_ALIGN_CONST);
+        dev = PTR_ALIGN(p, NETDEV_ALIGN);
         dev->padded = (char *)dev - (char *)p;
 
         if (dev_addr_init(dev))
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);