diff options
author | Inaky Perez-Gonzalez <inaky@linux.intel.com> | 2009-05-20 19:53:30 -0400 |
---|---|---|
committer | Inaky Perez-Gonzalez <inaky@linux.intel.com> | 2009-06-11 06:30:20 -0400 |
commit | 8593a1967fb9746d318dde88a0a39a36dbfc3445 (patch) | |
tree | 6e3d5e259ae08eab71c8442b2f7fa66bd1d39867 /drivers/net/wimax | |
parent | 10b1de6b774a531c9054ee01e734a85ffbab179e (diff) |
wimax/i2400m: rename misleading I2400M_PL_PAD to I2400M_PL_ALIGN
The constant is being use as an alignment factor, not as a padding
factor; made reading/reviewing the code quite confusing.
Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>
Diffstat (limited to 'drivers/net/wimax')
-rw-r--r-- | drivers/net/wimax/i2400m/fw.c | 2 | ||||
-rw-r--r-- | drivers/net/wimax/i2400m/rx.c | 4 | ||||
-rw-r--r-- | drivers/net/wimax/i2400m/tx.c | 4 |
3 files changed, 5 insertions, 5 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, | |||
397 | unsigned int direct, unsigned int do_csum) | 397 | unsigned int direct, unsigned int do_csum) |
398 | { | 398 | { |
399 | int ret; | 399 | int ret; |
400 | size_t chunk_len = ALIGN(__chunk_len, I2400M_PL_PAD); | 400 | size_t chunk_len = ALIGN(__chunk_len, I2400M_PL_ALIGN); |
401 | struct device *dev = i2400m_dev(i2400m); | 401 | struct device *dev = i2400m_dev(i2400m); |
402 | struct { | 402 | struct { |
403 | struct i2400m_bootrom_header cmd; | 403 | 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) | |||
1148 | num_pls = le16_to_cpu(msg_hdr->num_pls); | 1148 | num_pls = le16_to_cpu(msg_hdr->num_pls); |
1149 | pl_itr = sizeof(*msg_hdr) + /* Check payload descriptor(s) */ | 1149 | pl_itr = sizeof(*msg_hdr) + /* Check payload descriptor(s) */ |
1150 | num_pls * sizeof(msg_hdr->pld[0]); | 1150 | num_pls * sizeof(msg_hdr->pld[0]); |
1151 | pl_itr = ALIGN(pl_itr, I2400M_PL_PAD); | 1151 | pl_itr = ALIGN(pl_itr, I2400M_PL_ALIGN); |
1152 | if (pl_itr > skb->len) { /* got all the payload descriptors? */ | 1152 | if (pl_itr > skb->len) { /* got all the payload descriptors? */ |
1153 | dev_err(dev, "RX: HW BUG? message too short (%u bytes) for " | 1153 | dev_err(dev, "RX: HW BUG? message too short (%u bytes) for " |
1154 | "%u payload descriptors (%zu each, total %zu)\n", | 1154 | "%u payload descriptors (%zu each, total %zu)\n", |
@@ -1166,7 +1166,7 @@ int i2400m_rx(struct i2400m *i2400m, struct sk_buff *skb) | |||
1166 | single_last = num_pls == 1 || i == num_pls - 1; | 1166 | single_last = num_pls == 1 || i == num_pls - 1; |
1167 | i2400m_rx_payload(i2400m, skb, single_last, &msg_hdr->pld[i], | 1167 | i2400m_rx_payload(i2400m, skb, single_last, &msg_hdr->pld[i], |
1168 | skb->data + pl_itr); | 1168 | skb->data + pl_itr); |
1169 | pl_itr += ALIGN(pl_size, I2400M_PL_PAD); | 1169 | pl_itr += ALIGN(pl_size, I2400M_PL_ALIGN); |
1170 | cond_resched(); /* Don't monopolize */ | 1170 | cond_resched(); /* Don't monopolize */ |
1171 | } | 1171 | } |
1172 | kfree_skb(skb); | 1172 | 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) | |||
491 | */ | 491 | */ |
492 | hdr_size = sizeof(*tx_msg) | 492 | hdr_size = sizeof(*tx_msg) |
493 | + le16_to_cpu(tx_msg->num_pls) * sizeof(tx_msg->pld[0]); | 493 | + le16_to_cpu(tx_msg->num_pls) * sizeof(tx_msg->pld[0]); |
494 | hdr_size = ALIGN(hdr_size, I2400M_PL_PAD); | 494 | hdr_size = ALIGN(hdr_size, I2400M_PL_ALIGN); |
495 | tx_msg->offset = I2400M_TX_PLD_SIZE - hdr_size; | 495 | tx_msg->offset = I2400M_TX_PLD_SIZE - hdr_size; |
496 | tx_msg_moved = (void *) tx_msg + tx_msg->offset; | 496 | tx_msg_moved = (void *) tx_msg + tx_msg->offset; |
497 | memmove(tx_msg_moved, tx_msg, hdr_size); | 497 | 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, | |||
574 | 574 | ||
575 | d_fnstart(3, dev, "(i2400m %p skb %p [%zu bytes] pt %u)\n", | 575 | d_fnstart(3, dev, "(i2400m %p skb %p [%zu bytes] pt %u)\n", |
576 | i2400m, buf, buf_len, pl_type); | 576 | i2400m, buf, buf_len, pl_type); |
577 | padded_len = ALIGN(buf_len, I2400M_PL_PAD); | 577 | padded_len = ALIGN(buf_len, I2400M_PL_ALIGN); |
578 | d_printf(5, dev, "padded_len %zd buf_len %zd\n", padded_len, buf_len); | 578 | d_printf(5, dev, "padded_len %zd buf_len %zd\n", padded_len, buf_len); |
579 | /* If there is no current TX message, create one; if the | 579 | /* If there is no current TX message, create one; if the |
580 | * current one is out of payload slots or we have a singleton, | 580 | * current one is out of payload slots or we have a singleton, |