4 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c
index 7ee1b99b3843..26924f17f19d 100644
--- a/drivers/net/wimax/i2400m/fw.c
+++ b/drivers/net/wimax/i2400m/fw.c
@@ -397,7 +397,7 @@ static int i2400m_download_chunk(struct i2400m *i2400m, const void *chunk,
                                  unsigned int direct, unsigned int do_csum)
 {
         int ret;
-        size_t chunk_len = ALIGN(__chunk_len, I2400M_PL_PAD);
+        size_t chunk_len = ALIGN(__chunk_len, I2400M_PL_ALIGN);
         struct device *dev = i2400m_dev(i2400m);
         struct {
                 struct i2400m_bootrom_header cmd;
diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
index 7643850a6fb8..07c32e68909f 100644
--- a/drivers/net/wimax/i2400m/rx.c
+++ b/drivers/net/wimax/i2400m/rx.c
@@ -1148,7 +1148,7 @@ int i2400m_rx(struct i2400m *i2400m, struct sk_buff *skb)
         num_pls = le16_to_cpu(msg_hdr->num_pls);
         pl_itr = sizeof(*msg_hdr) +     /* Check payload descriptor(s) */
                 num_pls * sizeof(msg_hdr->pld[0]);
-        pl_itr = ALIGN(pl_itr, I2400M_PL_PAD);
+        pl_itr = ALIGN(pl_itr, I2400M_PL_ALIGN);
         if (pl_itr > skb->len) {        /* got all the payload descriptors? */
                 dev_err(dev, "RX: HW BUG? message too short (%u bytes) for "
                         "%u payload descriptors (%zu each, total %zu)\n",
@@ -1166,7 +1166,7 @@ int i2400m_rx(struct i2400m *i2400m, struct sk_buff *skb)
                 single_last = num_pls == 1 || i == num_pls - 1;
                 i2400m_rx_payload(i2400m, skb, single_last, &msg_hdr->pld[i],
                                   skb->data + pl_itr);
-                pl_itr += ALIGN(pl_size, I2400M_PL_PAD);
+                pl_itr += ALIGN(pl_size, I2400M_PL_ALIGN);
                 cond_resched();         /* Don't monopolize */
         }
         kfree_skb(skb);
diff --git a/drivers/net/wimax/i2400m/tx.c b/drivers/net/wimax/i2400m/tx.c
index 8ef724d31fbf..a635fd720f3e 100644
--- a/drivers/net/wimax/i2400m/tx.c
+++ b/drivers/net/wimax/i2400m/tx.c
@@ -491,7 +491,7 @@ void i2400m_tx_close(struct i2400m *i2400m)
          */
         hdr_size = sizeof(*tx_msg)
                 + le16_to_cpu(tx_msg->num_pls) * sizeof(tx_msg->pld[0]);
-        hdr_size = ALIGN(hdr_size, I2400M_PL_PAD);
+        hdr_size = ALIGN(hdr_size, I2400M_PL_ALIGN);
         tx_msg->offset = I2400M_TX_PLD_SIZE - hdr_size;
         tx_msg_moved = (void *) tx_msg + tx_msg->offset;
         memmove(tx_msg_moved, tx_msg, hdr_size);
@@ -574,7 +574,7 @@ int i2400m_tx(struct i2400m *i2400m, const void *buf, size_t buf_len,
 
         d_fnstart(3, dev, "(i2400m %p skb %p [%zu bytes] pt %u)\n",
                   i2400m, buf, buf_len, pl_type);
-        padded_len = ALIGN(buf_len, I2400M_PL_PAD);
+        padded_len = ALIGN(buf_len, I2400M_PL_ALIGN);
         d_printf(5, dev, "padded_len %zd buf_len %zd\n", padded_len, buf_len);
         /* If there is no current TX message, create one; if the
          * current one is out of payload slots or we have a singleton,
diff --git a/include/linux/wimax/i2400m.h b/include/linux/wimax/i2400m.h
index d5148a7889a6..433693ef2bb0 100644
--- a/include/linux/wimax/i2400m.h
+++ b/include/linux/wimax/i2400m.h
@@ -266,7 +266,7 @@ enum i2400m_ro_type {
 
 /* Misc constants */
 enum {
-        I2400M_PL_PAD = 16,     /* Payload data size alignment */
+        I2400M_PL_ALIGN = 16,   /* Payload data size alignment */
         I2400M_PL_SIZE_MAX = 0x3EFF,
         I2400M_MAX_PLS_IN_MSG = 60,
         /* protocol barkers: sync sequences; for notifications they