Commit 854984d7 authored Aug 27, 2013 by Larry Finger Committed by Greg Kroah-Hartman Aug 27, 2013

staging: r8188eu: Fix build error with random configuration

The kbuild test robot reports the following error:

tree:   git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git

 master
head:   e4a745f9519ef2bbb9d75212ae1cca7582d76266
commit: b63c0539 [7011/7939] staging: r8188eu: Turn on build of new driver
config: x86_64-randconfig-x0-0828 (attached as .config)

All error/warnings:

   drivers/staging/rtl8188eu/core/rtw_p2p.c: In function 'go_add_group_info_attr':
>> drivers/staging/rtl8188eu/core/rtw_p2p.c:70:11: error: 'struct sta_info' has no member named 'is_p2p_device'
      if (psta->is_p2p_device) {

This and the following errors were caused by an incorrect nesting of
conditional compilation directives.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 6850143a

drivers/staging/rtl8188eu/include/sta_info.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -180,6 +180,7 @@ struct sta_info {

		u8 has_legacy_ac;
		unsigned int sleepq_ac_len;
		#endif /* CONFIG_88EU_AP_MODE */

		#ifdef CONFIG_88EU_P2P
		/* p2p priv data */
		@@ -198,7 +199,6 @@ struct sta_info {
		#endif /* CONFIG_88EU_P2P */
		u8 under_exist_checking;
		u8 keep_alive_trycnt;
		#endif /* CONFIG_88EU_AP_MODE */

		/* for DM */
		struct rssi_sta rssi_stat;