Commit 78f2b22e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: r8188eu: fix include directory mess 



The driver seems to want to include a specific directory for all include
files on the build path, but that breaks when trying to build only the
module directory, or when building with "O=" option.

Fix this up by making all includes for the driver be relative locations.

Reported-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20210730144227.1770212-1-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 86949b52

drivers/staging/r8188eu/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ EXTRA_CFLAGS += -Wno-unused 


EXTRA_CFLAGS += -Wno-uninitialized



EXTRA_CFLAGS += -I$(src)/include



ccflags-y += -D__CHECK_ENDIAN__



CONFIG_R8188EU = m

drivers/staging/r8188eu/core/rtw_ap.c

+4 −4
Original line number Diff line number Diff line
@@ -3,10 +3,10 @@ 


#define _RTW_AP_C_



#include <osdep_service.h>

#include <drv_types.h>

#include <wifi.h>

#include <ieee80211.h>

#include "../include/osdep_service.h"

#include "../include/drv_types.h"

#include "../include/wifi.h"

#include "../include/ieee80211.h"



#ifdef CONFIG_88EU_AP_MODE

drivers/staging/r8188eu/core/rtw_br_ext.c

+16 −16
Original line number Diff line number Diff line
@@ -3,26 +3,26 @@ 


#define _RTW_BR_EXT_C_



#include <linux/if_arp.h>

#include <net/ip.h>

#include <net/ipx.h>

#include <linux/atalk.h>

#include <linux/udp.h>

#include <linux/if_pppox.h>



#include <drv_types.h>

#include "rtw_br_ext.h"

#include <usb_osintf.h>

#include <recv_osdep.h>

#include "../include/linux/if_arp.h"

#include "../include/net/ip.h"

#include "../include/net/ipx.h"

#include "../include/linux/atalk.h"

#include "../include/linux/udp.h"

#include "../include/linux/if_pppox.h"



#include "../include/drv_types.h"

#include "../include/rtw_br_ext.h"

#include "../include/usb_osintf.h"

#include "../include/recv_osdep.h"



#ifndef csum_ipv6_magic

#include <net/ip6_checksum.h>

#include "../include/net/ip6_checksum.h"

#endif



#include <linux/ipv6.h>

#include <linux/icmpv6.h>

#include <net/ndisc.h>

#include <net/checksum.h>

#include "../include/linux/ipv6.h"

#include "../include/linux/icmpv6.h"

#include "../include/net/ndisc.h"

#include "../include/net/checksum.h"



#define NAT25_IPV4		01

#define NAT25_IPV6		02

drivers/staging/r8188eu/core/rtw_cmd.c

+7 −7
Original line number Diff line number Diff line
@@ -3,13 +3,13 @@ 


#define _RTW_CMD_C_



#include <osdep_service.h>

#include <drv_types.h>

#include <recv_osdep.h>

#include <cmd_osdep.h>

#include <mlme_osdep.h>

#include <rtw_br_ext.h>

#include <rtw_mlme_ext.h>

#include "../include/osdep_service.h"

#include "../include/drv_types.h"

#include "../include/recv_osdep.h"

#include "../include/cmd_osdep.h"

#include "../include/mlme_osdep.h"

#include "../include/rtw_br_ext.h"

#include "../include/rtw_mlme_ext.h"



/*

Caller and the rtw_cmd_thread can protect cmd_q by spin_lock.

drivers/staging/r8188eu/core/rtw_debug.c

+2 −2
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ 


#define _RTW_DEBUG_C_



#include <rtw_debug.h>

#include <drv_types.h>

#include "../include/rtw_debug.h"

#include "../include/drv_types.h"



int proc_get_drv_version(char *page, char **start,

			  off_t offset, int count,