diff options
| author | Eliad Peller <eliad@wizery.com> | 2011-02-23 00:27:06 +0200 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2011-02-23 11:11:19 +0200 |
| commit | 02ad2d9080266e6d999c00b78610ef6a45be45ea (patch) | |
| tree | 6917f6174c2ea701477d757ebbae890d944f36ba /drivers/net/wireless/wl12xx/tx.c | |
| parent | 62c0740c4ff2a4a8850619e0f5ac56a3b6e83cec (diff) | |
| download | op-kernel-dev-02ad2d9080266e6d999c00b78610ef6a45be45ea.zip op-kernel-dev-02ad2d9080266e6d999c00b78610ef6a45be45ea.tar.gz | |
wl12xx: use standard ALIGN() macro
Use the standard ALIGN() macro instead of redefining similar macros.
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/tx.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/tx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/tx.c b/drivers/net/wireless/wl12xx/tx.c index 67a0094..94ff3fa 100644 --- a/drivers/net/wireless/wl12xx/tx.c +++ b/drivers/net/wireless/wl12xx/tx.c @@ -185,7 +185,7 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct sk_buff *skb, desc->reserved = 0; /* align the length (and store in terms of words) */ - pad = WL1271_TX_ALIGN(skb->len); + pad = ALIGN(skb->len, WL1271_TX_ALIGN_TO); desc->length = cpu_to_le16(pad >> 2); /* calculate number of padding bytes */ @@ -245,7 +245,7 @@ static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct sk_buff *skb, * pad the skb data to make sure its length is aligned. * The number of padding bytes is computed and set in wl1271_tx_fill_hdr */ - total_len = WL1271_TX_ALIGN(skb->len); + total_len = ALIGN(skb->len, WL1271_TX_ALIGN_TO); memcpy(wl->aggr_buf + buf_offset, skb->data, skb->len); memset(wl->aggr_buf + buf_offset + skb->len, 0, total_len - skb->len); |
