John W. Linville wrote:
> On Thu, Feb 12, 2009 at 07:35:17PM +1100, Stephen Rothwell wrote:
>> Today's linux-next build (powerpc allyesconfig) failed like this:
>>
>> net/built-in.o: In function `michael_mic':
>> (.opd+0x3ba78): multiple definition of `michael_mic'
>> drivers/built-in.o:(.opd+0x552a8): first defined here
>> net/built-in.o: In function `michael_mic':
>> net/mac80211/michael.c:58: multiple definition of `.michael_mic'
>> drivers/built-in.o:drivers/net/wireless/orinoco/mic.c:49: first defined here
>>
>> Immediate cause is commit 84875201dd1150dc2c16780b944fe501d588ffba
>> ("orinoco: Move MIC helpers into new file").
>
> I'll fix this up with a patch like below...
>
> John
I guess it only worked for me because I'm building modules.
Anyway, the fix needs to be slightly different:
> diff --git a/drivers/net/wireless/orinoco/mic.c b/drivers/net/wireless/orinoco/mic.c
> index c39d9ea..8cdac75 100644
> --- a/drivers/net/wireless/orinoco/mic.c
> +++ b/drivers/net/wireless/orinoco/mic.c
> @@ -16,18 +16,18 @@
> /********************************************************************/
> int orinoco_mic_init(struct orinoco_private *priv)
> {
> - priv->tx_tfm_mic = crypto_alloc_hash("michael_mic", 0, 0);
> + priv->tx_tfm_mic = crypto_alloc_hash("orinoco_mic", 0, 0);
That wants to remain as michael_mic, so we get the right crypto alg.
> if (IS_ERR(priv->tx_tfm_mic)) {
> printk(KERN_DEBUG "orinoco_mic_init: could not allocate "
> - "crypto API michael_mic\n");
> + "crypto API orinoco_mic\n");
Since we're referring to the crypto alg, I suggest this stay the same.
> priv->tx_tfm_mic = NULL;
> return -ENOMEM;
> }
>
> - priv->rx_tfm_mic = crypto_alloc_hash("michael_mic", 0, 0);
> + priv->rx_tfm_mic = crypto_alloc_hash("orinoco_mic", 0, 0);
Ditto 1.
> if (IS_ERR(priv->rx_tfm_mic)) {
> printk(KERN_DEBUG "orinoco_mic_init: could not allocate "
> - "crypto API michael_mic\n");
> + "crypto API orinoco_mic\n");
Ditto 2.
The rest is fine.
Regards,
Dave.
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
