mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-16 03:11:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

wifi: mac80211, cfg80211: Export michael_mic() and move it to cfg80211

Browse Source 
Export michael_mic() so that the ath11k and ath12k drivers can call it.
In addition, move it from mac80211 to cfg80211 so that the ipw2x00
drivers, which depend on cfg80211 but not mac80211, can also call it.

Currently these drivers have their own local implementations of
michael_mic() based on crypto_shash, which is redundant and inefficient.
By consolidating all the Michael MIC code into cfg80211, we'll be able
to remove the duplicate Michael MIC code in the crypto/ directory.

Signed-off-by: Eric Biggers <ebiggers@kernel.org>
Link: https://patch.msgid.link/20260408030651.80336-3-ebiggers@kernel.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Eric Biggers
2026-04-07 20:06:47 -07:00
committed by Johannes Berg
parent ea06baf59b
commit 613c837668
6 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/ieee80211.h
View File

@@ -1921,6 +1921,11 @@ enum ieee80211_radio_measurement_actioncode {
#define PMK_MAX_LEN 64
#define SAE_PASSWORD_MAX_LEN 128
#define MICHAEL_MIC_LEN 8
void michael_mic(const u8 *key, struct ieee80211_hdr *hdr,
const u8 *data, size_t data_len, u8 *mic);
/* Public action codes (IEEE Std 802.11-2016, 9.6.8.1, Table 9-307) */
enum ieee80211_pub_actioncode {
WLAN_PUB_ACTION_20_40_BSS_COEX = 0,

1
net/mac80211/Makefile
View File

@@ -18,7 +18,6 @@ mac80211-y := \
iface.o \
link.o \
rate.o \
michael.o \
tkip.o \
aes_cmac.o \
aes_gmac.o \

22
net/mac80211/michael.h
View File

@@ -1,22 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Michael MIC implementation - optimized for TKIP MIC operations
* Copyright 2002-2003, Instant802 Networks, Inc.
*/
#ifndef MICHAEL_H
#define MICHAEL_H
#include <linux/types.h>
#include <linux/ieee80211.h>
#define MICHAEL_MIC_LEN 8
struct michael_mic_ctx {
u32 l, r;
};
void michael_mic(const u8 *key, struct ieee80211_hdr *hdr,
const u8 *data, size_t data_len, u8 *mic);
#endif /* MICHAEL_H */

1
net/mac80211/wpa.c
View File

@@ -18,7 +18,6 @@
#include <crypto/utils.h>
#include "ieee80211_i.h"
#include "michael.h"
#include "tkip.h"
#include "aes_ccm.h"
#include "aes_cmac.h"

2
net/wireless/Makefile
View File

@@ -8,7 +8,7 @@ obj-$(CONFIG_WEXT_PRIV) += wext-priv.o
cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o
cfg80211-y += mlme.o ibss.o sme.o chan.o ethtool.o mesh.o ap.o trace.o ocb.o
cfg80211-y += pmsr.o
cfg80211-y += michael-mic.o pmsr.o
cfg80211-$(CONFIG_OF) += of.o
cfg80211-$(CONFIG_CFG80211_DEBUGFS) += debugfs.o
cfg80211-$(CONFIG_CFG80211_WEXT) += wext-compat.o wext-sme.o

5
net/mac80211/michael.c → net/wireless/michael-mic.c
View File

@@ -8,7 +8,9 @@
#include <linux/ieee80211.h>
#include <linux/unaligned.h>
#include "michael.h"
struct michael_mic_ctx {
u32 l, r;
};
static void michael_block(struct michael_mic_ctx *mctx, u32 val)
{
@@ -81,3 +83,4 @@ void michael_mic(const u8 *key, struct ieee80211_hdr *hdr,
put_unaligned_le32(mctx.l, mic);
put_unaligned_le32(mctx.r, mic + 4);
}
EXPORT_SYMBOL_GPL(michael_mic);