qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00
Code Activity

Merge commit 'nbd/master' into xburst

Browse Source 
Conflicts:

	target/linux/xburst/image/Makefile
This commit is contained in:
Lars-Peter Clausen
2010-03-11 20:30:57 +01:00
parent 1b7f171111 fce615f549
commit 1e67e793b2
251 changed files with 39570 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/base-files/files/etc/preinit
View File

@@ -9,7 +9,7 @@ preinit_essential_hook=
preinit_main_hook=
failsafe_hook=
initramfs_hook=
preinit_mount_root=
preinit_mount_root_hook=
pi_ifname=
pi_ip=192.168.1.1

2
package/base-files/files/lib/preinit/99_10_run_init
View File

@@ -5,7 +5,7 @@
run_init() {
preinit_echo "- init -"
preinit_ip_deconfig
if [ "$pi_init_stderr_suppress" = "y" ]; then
if [ "$pi_init_suppress_stderr" = "y" ]; then
exec env - PATH=$pi_init_path $pi_init_env $pi_init_cmd 2>&0
else
exec env - PATH=$pi_init_path $pi_init_env $pi_init_cmd

2
package/kernel/modules/block.mk
View File

@@ -10,7 +10,7 @@ BLOCK_MENU:=Block Devices
define KernelPackage/ata-core
SUBMENU:=$(BLOCK_MENU)
TITLE:=Serial and Parallel ATA support
DEPENDS:=@PCI_SUPPORT @LINUX_2_6 +kmod-scsi-core @!TARGET_ubicom32
DEPENDS:=@PCI_SUPPORT @LINUX_2_6 +kmod-scsi-core @(!TARGET_ubicom32||!TARGET_etrax)
KCONFIG:=CONFIG_ATA
FILES:=$(LINUX_DIR)/drivers/ata/libata.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,21,libata,1)

2
package/kernel/modules/fs.mk
View File

@@ -223,7 +223,7 @@ define KernelPackage/fs-nfs-common-v4
CONFIG_SUNRPC_GSS\
CONFIG_NFS_V4=y\
CONFIG_NFSD_V4=y
DEPENDS:= @LINUX_2_6 +kmod-fs-nfs-common
DEPENDS:= @LINUX_2_6 @BROKEN
FILES+=$(LINUX_DIR)/net/sunrpc/auth_gss/auth_rpcgss.$(LINUX_KMOD_SUFFIX)
AUTOLOAD=$(call AutoLoad,30,auth_rpcgss)
endef

2
package/kernel/modules/i2c.mk
View File

@@ -27,7 +27,7 @@ I2C_CORE_MODULES:= \
define KernelPackage/i2c-core
$(call i2c_defaults,$(I2C_CORE_MODULES),51)
TITLE:=I2C support
DEPENDS:=@LINUX_2_6
DEPENDS:=@LINUX_2_6 @!TARGET_etrax
endef
define KernelPackage/i2c-core/description

15
package/kernel/modules/other.mk
View File

@@ -170,7 +170,19 @@ define KernelPackage/pcmcia-yenta
SUBMENU:=$(OTHER_MENU)
TITLE:=yenta socket driver
DEPENDS:=kmod-pcmcia-core
KCONFIG:=CONFIG_YENTA
KCONFIG:= \
CONFIG_PCMCIA \
CONFIG_CARDBUS \
CONFIG_YENTA
endef
define KernelPackage/pcmcia-yenta/2.4
FILES:= \
$(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,41,yenta_socket)
endef
define KernelPackage/pcmcia-yenta/2.6
FILES:= \
$(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX)
@@ -179,6 +191,7 @@ endef
$(eval $(call KernelPackage,pcmcia-yenta))
define KernelPackage/pcmcia-au1000
SUBMENU:=$(OTHER_MENU)
TITLE:=RMI/AMD Au1000 PCMCIA support

13
package/kernel/modules/sound.mk
View File

@@ -132,3 +132,16 @@ define KernelPackage/sound-cs5535audio/description
endef
$(eval $(call KernelPackage,sound-cs5535audio))
define KernelPackage/sound-soc-core
$(call KernelPackage/sound/Depends)
TITLE:=SoC sound support
KCONFIG:= \
CONFIG_SND_SOC \
CONFIG_SND_SOC_ALL_CODECS=n
FILES:=$(LINUX_DIR)/sound/soc/snd-soc-core.ko
AUTOLOAD:=$(call AutoLoad,35, snd-soc-core)
endef
$(eval $(call KernelPackage,sound-soc-core))

5
package/mac80211/Makefile
View File

@@ -606,6 +606,7 @@ MAKE_OPTS:= \
ARCH="$(LINUX_KARCH)" \
EXTRA_CFLAGS="$(BUILDFLAGS)" \
$(foreach opt,$(CONFOPTS),CONFIG_$(opt)=m) \
CONFIG_MAC80211=$(if $(CONFIG_PACKAGE_kmod-mac80211),m) \
CONFIG_MAC80211_RC_PID=y \
CONFIG_MAC80211_RC_MINSTREL=y \
CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \
@@ -702,7 +703,7 @@ define Build/Prepare
rm $(PKG_BUILD_DIR)/include/linux/eeprom_93cx6.h
endef
ifneq ($(CONFIG_PACKAGE_kmod-mac80211),)
ifneq ($(CONFIG_PACKAGE_kmod-cfg80211),)
define Build/Compile/kmod
rm -rf $(PKG_BUILD_DIR)/modules
$(MAKE) -C "$(PKG_BUILD_DIR)" $(MAKE_OPTS) all
@@ -728,7 +729,7 @@ define KernelPackage/libertas/install
$(INSTALL_DATA) $(DL_DIR)/$(USB8388FW_NAME)-$(USB8388FW_VERSION).bin $(1)/lib/firmware/$(USB8388FW_NAME).bin
endef
define KernelPackage/mac80211/install
define KernelPackage/cfg80211/install
$(INSTALL_DIR) $(1)/lib/wifi
$(INSTALL_DATA) ./files/lib/wifi/mac80211.sh $(1)/lib/wifi
endef

48
package/mac80211/patches/580-tx_status_optimization.patch Normal file
View File

@@ -0,0 +1,48 @@
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -171,7 +171,7 @@ void ieee80211_tx_status(struct ieee8021
struct net_device *prev_dev = NULL;
struct sta_info *sta, *tmp;
int retry_count = -1, i;
- bool injected;
+ bool send_to_cooked;
for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
/* the HW cannot have attempted that rate */
@@ -296,11 +296,15 @@ void ieee80211_tx_status(struct ieee8021
/* this was a transmitted frame, but now we want to reuse it */
skb_orphan(skb);
+ /* Need to make a copy before skb->cb gets cleared */
+ send_to_cooked = !!(info->flags & IEEE80211_TX_CTL_INJECTED) ||
+ (type != IEEE80211_FTYPE_DATA);
+
/*
* This is a bit racy but we can avoid a lot of work
* with this test...
*/
- if (!local->monitors && !local->cooked_mntrs) {
+ if (!local->monitors && (!send_to_cooked || !local->cooked_mntrs)) {
dev_kfree_skb(skb);
return;
}
@@ -345,9 +349,6 @@ void ieee80211_tx_status(struct ieee8021
/* for now report the total retry_count */
rthdr->data_retries = retry_count;
- /* Need to make a copy before skb->cb gets cleared */
- injected = !!(info->flags & IEEE80211_TX_CTL_INJECTED);
-
/* XXX: is this sufficient for BPF? */
skb_set_mac_header(skb, 0);
skb->ip_summed = CHECKSUM_UNNECESSARY;
@@ -362,8 +363,7 @@ void ieee80211_tx_status(struct ieee8021
continue;
if ((sdata->u.mntr_flags & MONITOR_FLAG_COOK_FRAMES) &&
- !injected &&
- (type == IEEE80211_FTYPE_DATA))
+ !send_to_cooked)
continue;
if (prev_dev) {