Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-25 21:51:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

mac80211: add const, remove unused function, make one function static

Browse Source 
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: "John W. Linville" <linville@tuxdriver.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Harvey Harrison 2008-05-14 16:26:18 -07:00 committed by John W. Linville
parent 1b19ca3966
commit a7b6f0c555
4 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/mac80211/michael.c
View File

@ -6,7 +6,6 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#include <linux/types.h>
#include <linux/bitops.h>
#include <asm/unaligned.h>
@ -28,7 +27,7 @@ static void michael_block(struct michael_mic_ctx *mctx, u32 val)
}
static void michael_mic_hdr(struct michael_mic_ctx *mctx,
u8 *key, u8 *da, u8 *sa, u8 priority)
const u8 *key, const u8 *da, const u8 *sa, u8 priority)
{
mctx->l = get_unaligned_le32(key);
mctx->r = get_unaligned_le32(key + 4);
@ -44,8 +43,8 @@ static void michael_mic_hdr(struct michael_mic_ctx *mctx,
michael_block(mctx, priority);
}
void michael_mic(u8 *key, u8 *da, u8 *sa, u8 priority,
u8 *data, size_t data_len, u8 *mic)
void michael_mic(const u8 *key, const u8 *da, const u8 *sa, u8 priority,
const u8 *data, size_t data_len, u8 *mic)
{
u32 val;
size_t block, blocks, left;

4
net/mac80211/michael.h
View File

@ -18,7 +18,7 @@ struct michael_mic_ctx {
u32 l, r;
};
void michael_mic(u8 *key, u8 *da, u8 *sa, u8 priority,
u8 *data, size_t data_len, u8 *mic);
void michael_mic(const u8 *key, const u8 *da, const u8 *sa, u8 priority,
const u8 *data, size_t data_len, u8 *mic);
#endif /* MICHAEL_H */

12
net/mac80211/tkip.c
View File

@ -6,7 +6,6 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#include <linux/kernel.h>
#include <linux/bitops.h>
#include <linux/types.h>
@ -132,7 +131,7 @@ static void tkip_mixing_phase2(const u16 *p1k, const u8 *tk, u16 tsc_IV16,
/* Add TKIP IV and Ext. IV at @pos. @iv0, @iv1, and @iv2 are the first octets
* of the IV. Returns pointer to the octet following IVs (i.e., beginning of
* the packet payload). */
u8 * ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key,
u8 *ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key,
u8 iv0, u8 iv1, u8 iv2)
{
*pos++ = iv0;
@ -143,14 +142,7 @@ u8 * ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key,
return pos + 4;
}
void ieee80211_tkip_gen_phase1key(struct ieee80211_key *key, u8 *ta,
u16 *phase1key)
{
tkip_mixing_phase1(ta, &key->conf.key[ALG_TKIP_TEMP_ENCR_KEY],
key->u.tkip.iv32, phase1key);
}
void ieee80211_tkip_gen_rc4key(struct ieee80211_key *key, u8 *ta,
static void ieee80211_tkip_gen_rc4key(struct ieee80211_key *key, u8 *ta,
u8 *rc4key)
{
/* Calculate per-packet key */

4
net/mac80211/tkip.h
View File

@ -15,10 +15,6 @@
u8 *ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key,
u8 iv0, u8 iv1, u8 iv2);
void ieee80211_tkip_gen_phase1key(struct ieee80211_key *key, u8 *ta,
u16 *phase1key);
void ieee80211_tkip_gen_rc4key(struct ieee80211_key *key, u8 *ta,
u8 *rc4key);
void ieee80211_tkip_encrypt_data(struct crypto_blkcipher *tfm,
struct ieee80211_key *key,
u8 *pos, size_t payload_len, u8 *ta);