Merge branch 'master' of /home/cero1/src/openwrt

dtaht · Jun 27, 2012 · 7c22e7f · 7c22e7f
2 parents 69b3d75 + a081178
commit 7c22e7f
Show file tree

Hide file tree

Showing 10 changed files with 131 additions and 44 deletions.
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/version.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=110
+PKG_RELEASE:=111
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host

diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi
@@ -38,9 +38,12 @@ bridge_interface() {(
 	include /lib/network
 	scan_interfaces
 
-	config_get iftype "$cfg" type
-	[ "$iftype" = bridge ] && config_get "$cfg" ifname
-	prepare_interface_bridge "$cfg"
+	for cfg in $cfg; do
+		config_get iftype "$cfg" type
+		[ "$iftype" = bridge ] && config_get "$cfg" ifname
+		prepare_interface_bridge "$cfg"
+		return $?
+	done
 )}
 
 prepare_key_wep() {
@@ -132,7 +135,9 @@ start_net() {(
 	[ -z "$config" ] || {
 		include /lib/network
 		scan_interfaces
-		setup_interface "$iface" "$config" "" "$vifmac"
+		for config in $config; do
+			setup_interface "$iface" "$config" "" "$vifmac"
+		done
 	}
 )}
 

diff --git a/package/broadcom-wl/files/etc/hotplug.d/net/20-broadcom_wds b/package/broadcom-wl/files/etc/hotplug.d/net/20-broadcom_wds
@@ -23,7 +23,9 @@ setup_broadcom_wds() {
 			include /lib/network
 			scan_interfaces
 
-			setup_interface "$iface" "$network"
+			for network in $network; do
+				setup_interface "$iface" "$network"
+			done
 
 			config_get encryption "$cfg" encryption
 			config_get key "$cfg" key

diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
@@ -100,8 +100,6 @@ endef
 define Package/atm-tools/install
 	$(INSTALL_DIR) $(1)/usr/sbin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/arpd/atmarp{,d} $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/lib/network
-	$(INSTALL_BIN) ./files/ipoa.sh $(1)/lib/network/
 
 #
 #The following is disabled by default but still useful for some debugging

diff --git a/package/linux-atm/files/ipoa.sh b/package/linux-atm/files/ipoa.sh
diff --git a/package/mac80211/patches/561-ath9k_antenna_mask_validate.patch b/package/mac80211/patches/561-ath9k_antenna_mask_validate.patch
@@ -0,0 +1,33 @@
+--- a/drivers/net/wireless/ath/ath9k/main.c
++++ b/drivers/net/wireless/ath/ath9k/main.c
+@@ -1929,12 +1929,29 @@ static u32 fill_chainmask(u32 cap, u32 n
+ 	return filled;
+ }
+
++static bool validate_antenna_mask(struct ath_hw *ah, u32 val)
++{
++	switch (val & ah->caps.rx_chainmask) {
++	case 0x1:
++	case 0x3:
++	case 0x7:
++		return true;
++	case 0x2:
++		return (ah->caps.rx_chainmask == 1);
++	default:
++		return false;
++	}
++}
++
+ static int ath9k_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant)
+ {
+ 	struct ath_softc *sc = hw->priv;
+ 	struct ath_hw *ah = sc->sc_ah;
+
+-	if (!rx_ant || !tx_ant)
++	if (ah->caps.rx_chainmask != 1)
++		rx_ant |= tx_ant;
++
++	if (!validate_antenna_mask(ah, rx_ant) || !tx_ant)
+ 		return -EINVAL;
+
+ 	sc->ant_rx = rx_ant;
diff --git a/package/mac80211/patches/562-ath9k_reduce_ani_interval.patch b/package/mac80211/patches/562-ath9k_reduce_ani_interval.patch
@@ -0,0 +1,11 @@
+--- a/drivers/net/wireless/ath/ath9k/ani.h
++++ b/drivers/net/wireless/ath/ath9k/ani.h
+@@ -51,7 +51,7 @@
+ #define ATH9K_ANI_PERIOD                  300
+
+ /* in ms */
+-#define ATH9K_ANI_POLLINTERVAL            1000
++#define ATH9K_ANI_POLLINTERVAL            100
+
+ #define HAL_NOISE_IMMUNE_MAX              4
+ #define HAL_SPUR_IMMUNE_MAX               7
diff --git a/package/mac80211/patches/563-ath9k_enable_ar9340_ani.patch b/package/mac80211/patches/563-ath9k_enable_ar9340_ani.patch
@@ -0,0 +1,13 @@
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -676,10 +676,6 @@ static int __ath9k_hw_init(struct ath_hw
+ 	if (!AR_SREV_9300_20_OR_LATER(ah))
+ 		ah->ani_function &= ~ATH9K_ANI_MRC_CCK;
+
+-	/* disable ANI for 9340 */
+-	if (AR_SREV_9340(ah))
+-		ah->config.enable_ani = false;
+-
+ 	ath9k_hw_init_mode_regs(ah);
+
+ 	if (!ah->is_pciexpress)
diff --git a/package/mac80211/patches/564-ath9k_fix_ani_update.patch b/package/mac80211/patches/564-ath9k_fix_ani_update.patch
@@ -0,0 +1,59 @@
+--- a/drivers/net/wireless/ath/ath9k/ani.c
++++ b/drivers/net/wireless/ath/ath9k/ani.c
+@@ -153,9 +153,7 @@ static void ath9k_hw_set_ofdm_nil(struct
+ 		immunityLevel, BEACON_RSSI(ah),
+ 		aniState->rssiThrLow, aniState->rssiThrHigh);
+
+-	if (aniState->update_ani)
+-		aniState->ofdmNoiseImmunityLevel = immunityLevel;
+-
++	aniState->ofdmNoiseImmunityLevel = immunityLevel;
+ 	entry_ofdm = &ofdm_level_table[aniState->ofdmNoiseImmunityLevel];
+ 	entry_cck = &cck_level_table[aniState->cckNoiseImmunityLevel];
+
+@@ -222,9 +220,7 @@ static void ath9k_hw_set_cck_nil(struct 
+ 	    immunityLevel > ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI)
+ 		immunityLevel = ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI;
+
+-	if (aniState->update_ani)
+-		aniState->cckNoiseImmunityLevel = immunityLevel;
+-
++	aniState->cckNoiseImmunityLevel = immunityLevel;
+ 	entry_ofdm = &ofdm_level_table[aniState->ofdmNoiseImmunityLevel];
+ 	entry_cck = &cck_level_table[aniState->cckNoiseImmunityLevel];
+
+@@ -338,7 +334,6 @@ void ath9k_ani_reset(struct ath_hw *ah, 
+ 				aniState->ofdmNoiseImmunityLevel,
+ 				aniState->cckNoiseImmunityLevel);
+
+-			aniState->update_ani = false;
+ 			ofdm_nil = ATH9K_ANI_OFDM_DEF_LEVEL;
+ 			cck_nil = ATH9K_ANI_CCK_DEF_LEVEL;
+ 		}
+@@ -354,8 +349,6 @@ void ath9k_ani_reset(struct ath_hw *ah, 
+ 			is_scanning,
+ 			aniState->ofdmNoiseImmunityLevel,
+ 			aniState->cckNoiseImmunityLevel);
+-
+-			aniState->update_ani = true;
+ 	}
+ 	ath9k_hw_set_ofdm_nil(ah, ofdm_nil);
+ 	ath9k_hw_set_cck_nil(ah, cck_nil);
+@@ -538,7 +531,6 @@ void ath9k_hw_ani_init(struct ath_hw *ah
+ 		ani->ofdmWeakSigDetect = ATH9K_ANI_USE_OFDM_WEAK_SIG;
+ 		ani->cckNoiseImmunityLevel = ATH9K_ANI_CCK_DEF_LEVEL;
+ 		ani->ofdmNoiseImmunityLevel = ATH9K_ANI_OFDM_DEF_LEVEL;
+-		ani->update_ani = false;
+ 	}
+
+ 	/*
+--- a/drivers/net/wireless/ath/ath9k/ani.h
++++ b/drivers/net/wireless/ath/ath9k/ani.h
+@@ -116,7 +116,6 @@ struct ar5416AniState {
+ 	u8 firstepLevel;
+ 	u8 ofdmWeakSigDetect;
+ 	u8 cckWeakSigThreshold;
+-	bool update_ani;
+ 	u32 listenTime;
+ 	int32_t rssiThrLow;
+ 	int32_t rssiThrHigh;
diff --git a/package/netifd/Makefile b/package/netifd/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netifd
-PKG_VERSION:=2012-06-19
+PKG_VERSION:=2012-06-27
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://nbd.name/luci2/netifd.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=fa31a460d8cb59288c4324eb684bd3ce21e837c3
+PKG_SOURCE_VERSION:=13f7f295f33c2639c390d4a6b2c58d1845e12fc3
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 # PKG_MIRROR_MD5SUM:=
 # CMAKE_INSTALL:=1