Re: rt2x00dev.c:405: error: too few arguments to function ‘rt2x00crypto_rx_insert_iv’

[Andrew Price <andy@andrewprice.me.uk>]

On Thu, Sep 17, 2009 at 01:23:59PM -0400, John W. Linville wrote:
> On Thu, Sep 17, 2009 at 04:41:39PM +0100, Andrew Price wrote:
> > Hi Ivo,
> > 
> > Apologies if this has already been reported. Building today's mainline
> > kernel (ab86e5) I'm seeing this error:
> > 
> > drivers/net/wireless/rt2x00/rt2x00dev.c: In function ‘rt2x00lib_rxdone’:
> > drivers/net/wireless/rt2x00/rt2x00dev.c:405: warning: passing argument 3 of ‘rt2x00crypto_rx_insert_iv’ makes integer from pointer without a cast
> > drivers/net/wireless/rt2x00/rt2x00dev.c:405: error: too few arguments to function ‘rt2x00crypto_rx_insert_iv’
> 
> Strange...I don't see this warning.  Are you sure you have a clean checkout?

I double-checked:

- git status returned no changes
- git clean -fqdx
- ccache -C
- Retried the build

and still got the same error. Is this something to do with the second
definition of rt2x00crypto_rx_insert_iv still having an l2pad parameter...

This (untested) patch fixes the build for me:

--

diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h b/drivers/net/wireless/rt2x00/rt2x00lib.h
index 5462cb5..567f029 100644
--- a/drivers/net/wireless/rt2x00/rt2x00lib.h
+++ b/drivers/net/wireless/rt2x00/rt2x00lib.h
@@ -380,7 +380,7 @@ static inline void rt2x00crypto_tx_insert_iv(struct sk_buff *skb,
 {
 }
 
-static inline void rt2x00crypto_rx_insert_iv(struct sk_buff *skb, bool l2pad,
+static inline void rt2x00crypto_rx_insert_iv(struct sk_buff *skb,
 					     unsigned int header_length,
 					     struct rxdone_entry_desc *rxdesc)
 {