mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-15 18:03:30 +00:00
91d0fd154f
Removed, merged upstream:
- 170-wpa_supplicant-fix-compiling-without-IEEE8021X_EAPOL.patch
Manually refreshed:
- 040-mesh-allow-processing-authentication-frames-in-block.patch
- 600-ubus_support.patch
- 761-shared_das_port.patch
Fixes: a091a96 ("hostapd: always enable nl80211 driver support")
Signed-off-by: Andre Heider <a.heider@gmail.com>
60 lines
1.8 KiB
Diff
60 lines
1.8 KiB
Diff
--- a/hostapd/Makefile
|
|
+++ b/hostapd/Makefile
|
|
@@ -1396,7 +1396,7 @@ hostapd_multi.a: $(BCHECK) $(OBJS)
|
|
@$(AR) cr $@ hostapd_multi.o $(OBJS)
|
|
|
|
hostapd: $(OBJS)
|
|
- $(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
|
|
+ +$(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
|
|
@$(E) " LD " $@
|
|
|
|
ifdef CONFIG_WPA_TRACE
|
|
@@ -1407,7 +1407,7 @@ _OBJS_VAR := OBJS_c
|
|
include ../src/objs.mk
|
|
|
|
hostapd_cli: $(OBJS_c)
|
|
- $(Q)$(CC) $(LDFLAGS) -o hostapd_cli $(OBJS_c) $(LIBS_c)
|
|
+ +$(Q)$(CC) $(LDFLAGS) -o hostapd_cli $(OBJS_c) $(LIBS_c)
|
|
@$(E) " LD " $@
|
|
|
|
NOBJS = nt_password_hash.o ../src/crypto/ms_funcs.o $(SHA1OBJS)
|
|
--- a/wpa_supplicant/Makefile
|
|
+++ b/wpa_supplicant/Makefile
|
|
@@ -2039,31 +2039,31 @@ wpa_supplicant_multi.a: .config $(BCHECK
|
|
@$(AR) cr $@ wpa_supplicant_multi.o $(OBJS)
|
|
|
|
wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs)
|
|
- $(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS)
|
|
+ +$(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS)
|
|
@$(E) " LD " $@
|
|
|
|
_OBJS_VAR := OBJS_t
|
|
include ../src/objs.mk
|
|
eapol_test: $(OBJS_t)
|
|
- $(Q)$(LDO) $(LDFLAGS) -o eapol_test $(OBJS_t) $(LIBS)
|
|
+ +$(Q)$(LDO) $(LDFLAGS) -o eapol_test $(OBJS_t) $(LIBS)
|
|
@$(E) " LD " $@
|
|
|
|
_OBJS_VAR := OBJS_t2
|
|
include ../src/objs.mk
|
|
preauth_test: $(OBJS_t2)
|
|
- $(Q)$(LDO) $(LDFLAGS) -o preauth_test $(OBJS_t2) $(LIBS)
|
|
+ +$(Q)$(LDO) $(LDFLAGS) -o preauth_test $(OBJS_t2) $(LIBS)
|
|
@$(E) " LD " $@
|
|
|
|
_OBJS_VAR := OBJS_p
|
|
include ../src/objs.mk
|
|
wpa_passphrase: $(OBJS_p)
|
|
- $(Q)$(LDO) $(LDFLAGS) -o wpa_passphrase $(OBJS_p) $(LIBS_p) $(LIBS)
|
|
+ +$(Q)$(LDO) $(LDFLAGS) -o wpa_passphrase $(OBJS_p) $(LIBS_p) $(LIBS)
|
|
@$(E) " LD " $@
|
|
|
|
_OBJS_VAR := OBJS_c
|
|
include ../src/objs.mk
|
|
wpa_cli: $(OBJS_c)
|
|
- $(Q)$(LDO) $(LDFLAGS) -o wpa_cli $(OBJS_c) $(LIBS_c)
|
|
+ +$(Q)$(LDO) $(LDFLAGS) -o wpa_cli $(OBJS_c) $(LIBS_c)
|
|
@$(E) " LD " $@
|
|
|
|
LIBCTRL += ../src/common/wpa_ctrl.o
|