Commit 16fc54ee authored by Behan Webster's avatar Behan Webster Committed by Greg Kroah-Hartman
Browse files

staging, rtl8192e, LLVMLinux: Make static local in inline function const 



rtllib_association_req is a (large) inline function which defines 2 constant
static arrays which aren't labelled as const. As a result clang complains with:

non-constant static local variable in inline function may be different in
different files
[-Wstatic-local-in-inline]
  static u8       AironetIeOui[] = {0x00, 0x01, 0x66};
  ^
The solution is making them "static const".

However doing so requires dropping const when being used with struct
octet_string. However the value is used in a const fashion thereafter, so no
harm done.

Signed-off-by: default avatarBehan Webster <behanw@converseincode.com>
Suggested-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d82f0029

drivers/staging/rtl8192e/rtllib_softmac.c

+4 −3
Original line number Diff line number Diff line
@@ -1311,7 +1311,7 @@ inline struct sk_buff *rtllib_association_req(struct rtllib_network *beacon, 
	}



	if (beacon->bCkipSupported) {

		static u8	AironetIeOui[] = {0x00, 0x01, 0x66};

		static const u8 AironetIeOui[] = {0x00, 0x01, 0x66};

		u8	CcxAironetBuf[30];

		struct octet_string osCcxAironetIE;
@@ -1331,10 +1331,11 @@ inline struct sk_buff *rtllib_association_req(struct rtllib_network *beacon, 
	}



	if (beacon->bCcxRmEnable) {

		static u8 CcxRmCapBuf[] = {0x00, 0x40, 0x96, 0x01, 0x01, 0x00};

		static const u8 CcxRmCapBuf[] = {0x00, 0x40, 0x96, 0x01, 0x01,

			0x00};

		struct octet_string osCcxRmCap;



		osCcxRmCap.Octet = CcxRmCapBuf;

		osCcxRmCap.Octet = (u8 *) CcxRmCapBuf;

		osCcxRmCap.Length = sizeof(CcxRmCapBuf);

		tag = skb_put(skb, ccxrm_ie_len);

		*tag++ = MFIE_TYPE_GENERIC;