[NET]: DIV_ROUND_UP cleanup (part two)

[linux-2.6-omap-h63xx.git] / net / ieee80211 / ieee80211_crypt_ccmp.c

diff --git a/net/ieee80211/ieee80211_crypt_ccmp.c b/net/ieee80211/ieee80211_crypt_ccmp.c
index b016b4104de6d4893ba0dae8546bc7f1347026af..2e6b099fc84ce6b802c147b9f5e24efbfca77c24 100644 (file)
--- a/net/ieee80211/ieee80211_crypt_ccmp.c
+++ b/net/ieee80211/ieee80211_crypt_ccmp.c
@@ -9,6 +9,7 @@
  * more details.
  */
 
+#include <linux/kernel.h>
 #include <linux/err.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -241,7 +242,7 @@ static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
        hdr = (struct ieee80211_hdr_4addr *)skb->data;
        ccmp_init_blocks(key->tfm, hdr, key->tx_pn, data_len, b0, b, s0);
 
-       blocks = (data_len + AES_BLOCK_LEN - 1) / AES_BLOCK_LEN;
+       blocks = DIV_ROUND_UP(data_len, AES_BLOCK_LEN);
        last = data_len % AES_BLOCK_LEN;
 
        for (i = 1; i <= blocks; i++) {
@@ -351,7 +352,7 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
        ccmp_init_blocks(key->tfm, hdr, pn, data_len, b0, a, b);
        xor_block(mic, b, CCMP_MIC_LEN);
 
-       blocks = (data_len + AES_BLOCK_LEN - 1) / AES_BLOCK_LEN;
+       blocks = DIV_ROUND_UP(data_len, AES_BLOCK_LEN);
        last = data_len % AES_BLOCK_LEN;
 
        for (i = 1; i <= blocks; i++) {