mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-14 01:49:20 -04:00
staging: ks7010: Remove trailing _t from 'struct michael_mic_t'.
The "_t" suffix is not needed for structure names in this driver, and is a reflection of an older typedef system that is no longer in place. Replace all occurences of 'struct michael_mic_t' with 'struct michael_mic'. Signed-off-by: Quytelda Kahja <quytelda@tamalin.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
e7814c00df
commit
e5082ba1d0
@@ -315,7 +315,7 @@ int hostif_data_indication_wpa(struct ks_wlan_private *priv,
|
||||
char buf[128];
|
||||
unsigned long now;
|
||||
struct mic_failure *mic_failure;
|
||||
struct michael_mic_t michael_mic;
|
||||
struct michael_mic michael_mic;
|
||||
union iwreq_data wrqu;
|
||||
unsigned int key_index = auth_type - 1;
|
||||
struct wpa_key *key = &priv->wpa.key[key_index];
|
||||
@@ -1065,7 +1065,7 @@ int hostif_data_request(struct ks_wlan_private *priv, struct sk_buff *skb)
|
||||
int result = 0;
|
||||
unsigned short eth_proto;
|
||||
struct ether_hdr *eth_hdr;
|
||||
struct michael_mic_t michael_mic;
|
||||
struct michael_mic michael_mic;
|
||||
unsigned short keyinfo = 0;
|
||||
struct ieee802_1x_hdr *aa1x_hdr;
|
||||
struct wpa_eapol_key *eap_key;
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
|
||||
// Reset the state to the empty message.
|
||||
static inline void michael_clear(struct michael_mic_t *mic)
|
||||
static inline void michael_clear(struct michael_mic *mic)
|
||||
{
|
||||
mic->l = mic->k0;
|
||||
mic->r = mic->k1;
|
||||
mic->m_bytes = 0;
|
||||
}
|
||||
|
||||
static void michael_init(struct michael_mic_t *mic, u8 *key)
|
||||
static void michael_init(struct michael_mic *mic, u8 *key)
|
||||
{
|
||||
// Set the key
|
||||
mic->k0 = get_unaligned_le32(key);
|
||||
@@ -34,7 +34,7 @@ static void michael_init(struct michael_mic_t *mic, u8 *key)
|
||||
michael_clear(mic);
|
||||
}
|
||||
|
||||
static inline void michael_block(struct michael_mic_t *mic)
|
||||
static inline void michael_block(struct michael_mic *mic)
|
||||
{
|
||||
mic->r ^= rol32(mic->l, 17);
|
||||
mic->l += mic->r;
|
||||
@@ -47,7 +47,7 @@ static inline void michael_block(struct michael_mic_t *mic)
|
||||
mic->l += mic->r;
|
||||
}
|
||||
|
||||
static void michael_append(struct michael_mic_t *mic, u8 *src, int bytes)
|
||||
static void michael_append(struct michael_mic *mic, u8 *src, int bytes)
|
||||
{
|
||||
int addlen;
|
||||
|
||||
@@ -81,7 +81,7 @@ static void michael_append(struct michael_mic_t *mic, u8 *src, int bytes)
|
||||
}
|
||||
}
|
||||
|
||||
static void michael_get_mic(struct michael_mic_t *mic, u8 *dst)
|
||||
static void michael_get_mic(struct michael_mic *mic, u8 *dst)
|
||||
{
|
||||
u8 *data = mic->m;
|
||||
|
||||
@@ -110,7 +110,7 @@ static void michael_get_mic(struct michael_mic_t *mic, u8 *dst)
|
||||
michael_clear(mic);
|
||||
}
|
||||
|
||||
void michael_mic_function(struct michael_mic_t *mic, u8 *key,
|
||||
void michael_mic_function(struct michael_mic *mic, u8 *key,
|
||||
u8 *data, int len, u8 priority, u8 *result)
|
||||
{
|
||||
u8 pad_data[4] = { priority, 0, 0, 0 };
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
*/
|
||||
|
||||
/* MichaelMIC routine define */
|
||||
struct michael_mic_t {
|
||||
struct michael_mic {
|
||||
u32 k0; // Key
|
||||
u32 k1; // Key
|
||||
u32 l; // Current state
|
||||
@@ -20,5 +20,5 @@ struct michael_mic_t {
|
||||
u8 result[8];
|
||||
};
|
||||
|
||||
void michael_mic_function(struct michael_mic_t *mic, u8 *key,
|
||||
void michael_mic_function(struct michael_mic *mic, u8 *key,
|
||||
u8 *data, int len, u8 priority, u8 *result);
|
||||
|
||||
Reference in New Issue
Block a user