tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

wifi: ipw2x00: Rename michael_mic() to libipw_michael_mic()

Rename the driver-local michael_mic() function to libipw_michael_mic()
to prevent a name conflict with the common michael_mic() function.

Note that this code will be superseded later when libipw starts using
the common michael_mic(). This commit just prevents a bisection hazard.

Signed-off-by: Eric Biggers <ebiggers@kernel.org>
Link: https://patch.msgid.link/20260408030651.80336-2-ebiggers@kernel.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

authored by

Eric Biggers and committed by
Johannes Berg ea06baf5 c9b7f640

+3 -3
+3 -3
drivers/net/wireless/intel/ipw2x00/libipw_crypto_tkip.c
··· 464 464 return keyidx; 465 465 } 466 466 467 - static int michael_mic(struct crypto_shash *tfm_michael, u8 *key, u8 *hdr, 467 + static int libipw_michael_mic(struct crypto_shash *tfm_michael, u8 *key, u8 *hdr, 468 468 u8 *data, size_t data_len, u8 *mic) 469 469 { 470 470 SHASH_DESC_ON_STACK(desc, tfm_michael); ··· 546 546 547 547 michael_mic_hdr(skb, tkey->tx_hdr); 548 548 pos = skb_put(skb, 8); 549 - if (michael_mic(tkey->tx_tfm_michael, &tkey->key[16], tkey->tx_hdr, 549 + if (libipw_michael_mic(tkey->tx_tfm_michael, &tkey->key[16], tkey->tx_hdr, 550 550 skb->data + hdr_len, skb->len - 8 - hdr_len, pos)) 551 551 return -1; 552 552 ··· 584 584 return -1; 585 585 586 586 michael_mic_hdr(skb, tkey->rx_hdr); 587 - if (michael_mic(tkey->rx_tfm_michael, &tkey->key[24], tkey->rx_hdr, 587 + if (libipw_michael_mic(tkey->rx_tfm_michael, &tkey->key[24], tkey->rx_hdr, 588 588 skb->data + hdr_len, skb->len - 8 - hdr_len, mic)) 589 589 return -1; 590 590 if (memcmp(mic, skb->data + skb->len - 8, 8) != 0) {