Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / staging / ks7010 / michael_mic.c

diff --git a/drivers/staging/ks7010/michael_mic.c b/drivers/staging/ks7010/michael_mic.c
index f6e70fa2a12f70988c7b5dde79b8f23ad7d65a82..80497ef5b1aafbd1f42cf567946f53471dd7282a 100644 (file)
--- a/drivers/staging/ks7010/michael_mic.c
+++ b/drivers/staging/ks7010/michael_mic.c
@@ -38,7 +38,7 @@ do {                                  \
 } while (0)
 
 static
-void MichaelInitializeFunction(struct michel_mic_t *Mic, uint8_t *key)
+void MichaelInitializeFunction(struct michael_mic_t *Mic, uint8_t *key)
 {
        // Set the key
        Mic->K0 = getUInt32(key, 0);
@@ -61,7 +61,7 @@ do {                                                          \
 } while (0)
 
 static
-void MichaelAppend(struct michel_mic_t *Mic, uint8_t *src, int nBytes)
+void MichaelAppend(struct michael_mic_t *Mic, uint8_t *src, int nBytes)
 {
        int addlen;
 
@@ -96,7 +96,7 @@ void MichaelAppend(struct michel_mic_t *Mic, uint8_t *src, int nBytes)
 }
 
 static
-void MichaelGetMIC(struct michel_mic_t *Mic, uint8_t *dst)
+void MichaelGetMIC(struct michael_mic_t *Mic, uint8_t *dst)
 {
        u8 *data = Mic->M;
 
@@ -125,7 +125,7 @@ void MichaelGetMIC(struct michel_mic_t *Mic, uint8_t *dst)
        MichaelClear(Mic);
 }
 
-void MichaelMICFunction(struct michel_mic_t *Mic, u8 *Key,
+void MichaelMICFunction(struct michael_mic_t *Mic, u8 *Key,
                        u8 *Data, int Len, u8 priority,
                        u8 *Result)
 {
@@ -141,8 +141,8 @@ void MichaelMICFunction(struct michel_mic_t *Mic, u8 *Key,
         * +--+--+--------+--+----+--+--+--+--+--+--+--+--+
         */
        MichaelInitializeFunction(Mic, Key);
-       MichaelAppend(Mic, (uint8_t *) Data, 12);       /* |DA|SA| */
+       MichaelAppend(Mic, (uint8_t *)Data, 12);        /* |DA|SA| */
        MichaelAppend(Mic, pad_data, 4);        /* |Priority|0|0|0| */
-       MichaelAppend(Mic, (uint8_t *) (Data + 12), Len - 12);  /* |Data| */
+       MichaelAppend(Mic, (uint8_t *)(Data + 12), Len - 12);   /* |Data| */
        MichaelGetMIC(Mic, Result);
 }