Add missing aes_ccmp.h header and move device.h to
aes_ccmp.h
sparse warning
aes_ccmp.c:221:6: warning: symbol 'AESbGenCCMP' was not declared. Should it be static?
Signed-off-by: Malcolm Priestley <[email protected]>
---
drivers/staging/vt6656/aes_ccmp.c | 2 +-
drivers/staging/vt6656/aes_ccmp.h | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/vt6656/aes_ccmp.c b/drivers/staging/vt6656/aes_ccmp.c
index 61b9f7b..3dbf458 100644
--- a/drivers/staging/vt6656/aes_ccmp.c
+++ b/drivers/staging/vt6656/aes_ccmp.c
@@ -30,7 +30,7 @@
* Revision History:
*/
-#include "device.h"
+#include "aes_ccmp.h"
#include "80211hdr.h"
/*
diff --git a/drivers/staging/vt6656/aes_ccmp.h b/drivers/staging/vt6656/aes_ccmp.h
index ed6a9ae..4cac3ec 100644
--- a/drivers/staging/vt6656/aes_ccmp.h
+++ b/drivers/staging/vt6656/aes_ccmp.h
@@ -30,6 +30,8 @@
#ifndef __AES_H__
#define __AES_H__
+#include "device.h"
+
bool AESbGenCCMP(u8 * pbyRxKey, u8 * pbyFrame, u16 wFrameSize);
#endif /* __AES_CCMP_H__ */
--
1.8.5.2
On Mon, Jan 13, 2014 at 04:29:15PM +0000, Malcolm Priestley wrote:
> Add missing aes_ccmp.h header and move device.h to
> aes_ccmp.h
Why move device.h?
That shouldn't be needed to fix this issue.
> sparse warning
> aes_ccmp.c:221:6: warning: symbol 'AESbGenCCMP' was not declared. Should it be static?
>
> Signed-off-by: Malcolm Priestley <[email protected]>
> ---
> drivers/staging/vt6656/aes_ccmp.c | 2 +-
> drivers/staging/vt6656/aes_ccmp.h | 2 ++
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/staging/vt6656/aes_ccmp.c b/drivers/staging/vt6656/aes_ccmp.c
> index 61b9f7b..3dbf458 100644
> --- a/drivers/staging/vt6656/aes_ccmp.c
> +++ b/drivers/staging/vt6656/aes_ccmp.c
> @@ -30,7 +30,7 @@
> * Revision History:
> */
>
> -#include "device.h"
> +#include "aes_ccmp.h"
> #include "80211hdr.h"
>
> /*
> diff --git a/drivers/staging/vt6656/aes_ccmp.h b/drivers/staging/vt6656/aes_ccmp.h
> index ed6a9ae..4cac3ec 100644
> --- a/drivers/staging/vt6656/aes_ccmp.h
> +++ b/drivers/staging/vt6656/aes_ccmp.h
> @@ -30,6 +30,8 @@
> #ifndef __AES_H__
> #define __AES_H__
>
> +#include "device.h"
If you can prevent it, keeping .h files from having to include other .h
files is a good thing.
thanks,
greg k-h
On Mon, 2014-01-13 at 15:46 -0800, Greg KH wrote:
> On Mon, Jan 13, 2014 at 04:29:15PM +0000, Malcolm Priestley wrote:
> > Add missing aes_ccmp.h header and move device.h to
> > aes_ccmp.h
>
> Why move device.h?
device.h is needed by aes_ccmp.h and only currently gets away with it
by the include order elsewhere.
I didn't see the need to include device.h twice or fix
it with the include order in aes_ccmo.c, there is enough of
that already in this driver.
Regards
Malcolm
> That shouldn't be needed to fix this issue.
>
> > sparse warning
> > aes_ccmp.c:221:6: warning: symbol 'AESbGenCCMP' was not declared. Should it be static?
> >
> > Signed-off-by: Malcolm Priestley <[email protected]>
> > ---
> > drivers/staging/vt6656/aes_ccmp.c | 2 +-
> > drivers/staging/vt6656/aes_ccmp.h | 2 ++
> > 2 files changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/staging/vt6656/aes_ccmp.c b/drivers/staging/vt6656/aes_ccmp.c
> > index 61b9f7b..3dbf458 100644
> > --- a/drivers/staging/vt6656/aes_ccmp.c
> > +++ b/drivers/staging/vt6656/aes_ccmp.c
> > @@ -30,7 +30,7 @@
> > * Revision History:
> > */
> >
> > -#include "device.h"
> > +#include "aes_ccmp.h"
> > #include "80211hdr.h"
> >
> > /*
> > diff --git a/drivers/staging/vt6656/aes_ccmp.h b/drivers/staging/vt6656/aes_ccmp.h
> > index ed6a9ae..4cac3ec 100644
> > --- a/drivers/staging/vt6656/aes_ccmp.h
> > +++ b/drivers/staging/vt6656/aes_ccmp.h
> > @@ -30,6 +30,8 @@
> > #ifndef __AES_H__
> > #define __AES_H__
> >
> > +#include "device.h"
>
> If you can prevent it, keeping .h files from having to include other .h
> files is a good thing.
>
> thanks,
>
> greg k-h
On Tue, Jan 14, 2014 at 09:00:08PM +0000, Malcolm Priestley wrote:
> On Mon, 2014-01-13 at 15:46 -0800, Greg KH wrote:
> > On Mon, Jan 13, 2014 at 04:29:15PM +0000, Malcolm Priestley wrote:
> > > Add missing aes_ccmp.h header and move device.h to
> > > aes_ccmp.h
> >
> > Why move device.h?
> device.h is needed by aes_ccmp.h and only currently gets away with it
> by the include order elsewhere.
Then fix that up first.
> I didn't see the need to include device.h twice or fix
> it with the include order in aes_ccmo.c, there is enough of
> that already in this driver.
Fix it properly, as it will have to be resolved sometime, right?
thanks,
greg k-h
On Tue, 2014-01-14 at 13:19 -0800, Greg KH wrote:
> On Tue, Jan 14, 2014 at 09:00:08PM +0000, Malcolm Priestley wrote:
> > On Mon, 2014-01-13 at 15:46 -0800, Greg KH wrote:
> > > On Mon, Jan 13, 2014 at 04:29:15PM +0000, Malcolm Priestley wrote:
> > > > Add missing aes_ccmp.h header and move device.h to
> > > > aes_ccmp.h
> > >
> > > Why move device.h?
> > device.h is needed by aes_ccmp.h and only currently gets away with it
> > by the include order elsewhere.
>
> Then fix that up first.
>
> > I didn't see the need to include device.h twice or fix
> > it with the include order in aes_ccmo.c, there is enough of
> > that already in this driver.
>
> Fix it properly, as it will have to be resolved sometime, right?
>
The headers are just too tangled to fix just yet.
There is still a lot of typedefs, duplicate and dead code spread across
the driver that need removing first.
I've just realised that aes_ccmp.c is dead code, it is part of the
non functioning hostapd code in hostap.c, I am planning to remove it.
Regards
Malcolm
> thanks,
>
> greg k-h