Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[libiwinfo]

Browse source 
- fix compilation of WL backend
	- conditionally compile backends according to selected wifi drivers
This commit is contained in:
Jo-Philipp Wich 2010-09-27 15:38:35 +00:00
parent 197d043107
commit 16d65c96b0
4 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
contrib/package/iwinfo/Makefile
View file

@ -19,7 +19,7 @@ define Package/libiwinfo
CATEGORY:=LuCI CATEGORY:=LuCI
SUBMENU:=Libraries SUBMENU:=Libraries
TITLE:=Generalized Wireless Information Library (iwinfo) TITLE:=Generalized Wireless Information Library (iwinfo)
DEPENDS:=+libnl-tiny +liblua +lua DEPENDS:=+PACKAGE_kmod-mac80211:libnl-tiny +liblua +lua
endef endef
define Package/libiwinfo/description define Package/libiwinfo/description
@ -35,6 +35,11 @@ endef
define Build/Configure define Build/Configure
endef endef
IWINFO_BACKENDS := \
$(if $(CONFIG_PACKAGE_kmod-brcm-wl),wl) \
$(if $(CONFIG_PACKAGE_kmod-madwifi),madwifi) \
$(if $(CONFIG_PACKAGE_kmod-mac80211),nl80211)
TARGET_CFLAGS += \ TARGET_CFLAGS += \
-I$(STAGING_DIR)/usr/include \ -I$(STAGING_DIR)/usr/include \
-I$(STAGING_DIR)/usr/include/libnl-tiny -I$(STAGING_DIR)/usr/include/libnl-tiny
@ -42,7 +47,8 @@ TARGET_CFLAGS += \
MAKE_FLAGS += \ MAKE_FLAGS += \
FPIC="$(FPIC)" \ FPIC="$(FPIC)" \
CFLAGS="$(TARGET_CFLAGS)" \ CFLAGS="$(TARGET_CFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" \
BACKENDS="$(IWINFO_BACKENDS)"
define Package/libiwinfo/install define Package/libiwinfo/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin

25
contrib/package/iwinfo/src/Makefile
View file

@ -1,8 +1,25 @@
IWINFO_LDFLAGS = $(LDFLAGS) -shared -llua $(if $(CRAP),,-lnl-tiny) IWINFO_BACKENDS = $(if $(BACKENDS),$(BACKENDS),madwifi nl80211)
IWINFO_CFLAGS = $(CFLAGS) -std=gnu99 -fstrict-aliasing $(if $(CRAP),-DUSE_WL,-DUSE_MADWIFI -DUSE_NL80211) IWINFO_LDFLAGS = $(LDFLAGS) -shared -llua
IWINFO_CFLAGS = $(CFLAGS) -std=gnu99 -fstrict-aliasing
IWINFO_SO = iwinfo.so IWINFO_SO = iwinfo.so
IWINFO_OBJ = $(if $(CRAP),iwinfo_wl.o,iwinfo_madwifi.o iwinfo_nl80211.o) \ IWINFO_OBJ = iwinfo_wext.o iwinfo_wext_scan.o iwinfo_lualib.o
iwinfo_wext.o iwinfo_wext_scan.o iwinfo_lualib.o
ifneq ($(filter wl,$(IWINFO_BACKENDS)),)
IWINFO_CFLAGS += -DUSE_WL
IWINFO_OBJ += iwinfo_wl.o
endif
ifneq ($(filter madwifi,$(IWINFO_BACKENDS)),)
IWINFO_CFLAGS += -DUSE_MADWIFI
IWINFO_OBJ += iwinfo_madwifi.o
endif
ifneq ($(filter nl80211,$(IWINFO_BACKENDS)),)
IWINFO_CFLAGS += -DUSE_NL80211
IWINFO_LDFLAGS += -lnl-tiny
IWINFO_OBJ += iwinfo_nl80211.o
endif
%.o: %.c %.o: %.c
$(CC) $(IWINFO_CFLAGS) $(LUA_CFLAGS) $(FPIC) -c -o $@ $< $(CC) $(IWINFO_CFLAGS) $(LUA_CFLAGS) $(FPIC) -c -o $@ $<

1
contrib/package/iwinfo/src/include/broadcom.h
View file

@ -29,6 +29,7 @@
#define WLC_GET_MAGIC 0 #define WLC_GET_MAGIC 0
#define WLC_GET_RATE 12 #define WLC_GET_RATE 12
#define WLC_GET_INFRA 19 #define WLC_GET_INFRA 19
#define WLC_GET_AUTH 21
#define WLC_GET_BSSID 23 #define WLC_GET_BSSID 23
#define WLC_GET_SSID 25 #define WLC_GET_SSID 25
#define WLC_GET_CHANNEL 29 #define WLC_GET_CHANNEL 29

2
contrib/package/iwinfo/src/iwinfo_wl.c
View file

@ -265,7 +265,7 @@ int wl_get_encryption(const char *ifname, char *buf)
c->auth_algs |= IWINFO_AUTH_SHARED; c->auth_algs |= IWINFO_AUTH_SHARED;
/* ToDo: evaluate WEP key lengths */ /* ToDo: evaluate WEP key lengths */
c->auth_ciphers = IWINFO_CIPHER_WEP40 | IWINFO_CIPHER_WEP104; c->pair_ciphers = IWINFO_CIPHER_WEP40 | IWINFO_CIPHER_WEP104;
c->auth_suites |= IWINFO_KMGMT_NONE; c->auth_suites |= IWINFO_KMGMT_NONE;
break; break;