Merge pull request #37 from wigyori/master

Pull req for mwlwifi, archs38, bcm53xx and core package updates

24 files changed, 180 insertions, 503 deletions

diff --git a/package/devel/strace/Makefile b/package/devel/strace/Makefile
index df560fd1b7..6d9a7be534 100644
--- a/package/devel/strace/Makefile
+++ b/package/devel/strace/Makefile
@@ -10,9 +10,9 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=strace
 
-PKG_VERSION:=4.11
-PKG_RELEASE:=2
-PKG_MD5SUM:=a15d2555a7febb56d00c6e1a51c655dc
+PKG_VERSION:=4.12
+PKG_RELEASE:=1
+PKG_MD5SUM:=efb8611fc332e71ec419c53f59faa93e
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
diff --git a/package/devel/valgrind/Makefile b/package/devel/valgrind/Makefile
index 6a576a24d0..04d06d91a6 100644
--- a/package/devel/valgrind/Makefile
+++ b/package/devel/valgrind/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=valgrind
-PKG_VERSION:=3.10.1
+PKG_VERSION:=3.11.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://valgrind.org/downloads/
-PKG_MD5SUM:=60ddae962bc79e7c95cfc4667245707f
+PKG_MD5SUM:=6c396271a8c1ddd5a6fb9abe714ea1e8a86fce85b30ab26b4266aeb4c2413b42
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=GPL-2.0+
@@ -22,6 +22,7 @@ PKG_FIXUP = autoreconf
 PKG_INSTALL := 1
 PKG_BUILD_PARALLEL := 1
 PKG_USE_MIPS16:=0
+PKG_SSP:=0
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk
diff --git a/package/devel/valgrind/patches/100-fix_configure_check.patch b/package/devel/valgrind/patches/100-fix_configure_check.patch
index 87ef3b39fc..48477a3863 100644
--- a/package/devel/valgrind/patches/100-fix_configure_check.patch
+++ b/package/devel/valgrind/patches/100-fix_configure_check.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -300,7 +300,7 @@ case "${host_os}" in
+@@ -328,7 +328,7 @@ case "${host_os}" in
          # Ok, this is linux. Check the kernel version
          AC_MSG_CHECKING([for the kernel version])
  
@@ -8,4 +8,4 @@
 +        kernel=${UNAME_R:-`uname -r`}
  
          case "${kernel}" in
-              2.6.*|3.*) 
+              0.*|1.*|2.0.*|2.1.*|2.2.*|2.3.*|2.4.*|2.5.*) 
diff --git a/package/devel/valgrind/patches/120-Fix-configure-for-Linux-kernel-4.0-rc1.patch b/package/devel/valgrind/patches/120-Fix-configure-for-Linux-kernel-4.0-rc1.patch
deleted file mode 100644
index b833f18946..0000000000
--- a/package/devel/valgrind/patches/120-Fix-configure-for-Linux-kernel-4.0-rc1.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From bf803555d10b5b4c9223b24bf13845ee88d8f3b5 Mon Sep 17 00:00:00 2001
-From: cborntra <cborntra@a5019735-40e9-0310-863c-91ae7b9d1cf9>
-Date: Mon, 23 Feb 2015 20:19:03 +0000
-Subject: [PATCH] Fix configure for Linux kernel >= 4.0-rc1 In addition raise
- the minimal Linux version to 2.6 as there is almost no test coverage for 2.4
- and 2.6 was released in 2003.
-
-git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14955 a5019735-40e9-0310-863c-91ae7b9d1cf9
----
- NEWS         |  3 +++
- configure.ac | 18 ++++++------------
- 2 files changed, 9 insertions(+), 12 deletions(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -303,20 +303,14 @@ case "${host_os}" in
-         kernel=${UNAME_R:-`uname -r`}
- 
-         case "${kernel}" in
--             2.6.*|3.*) 
--        	    AC_MSG_RESULT([2.6.x/3.x family (${kernel})])
--        	    AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x or Linux 3.x])
--        	    ;;
--
--             2.4.*) 
--        	    AC_MSG_RESULT([2.4 family (${kernel})])
--        	    AC_DEFINE([KERNEL_2_4], 1, [Define to 1 if you're using Linux 2.4.x])
--        	    ;;
--
--             *) 
-+             0.*|1.*|2.0.*|2.1.*|2.2.*|2.3.*|2.4.*|2.5.*) 
-         	    AC_MSG_RESULT([unsupported (${kernel})])
--        	    AC_MSG_ERROR([Valgrind works on kernels 2.4, 2.6])
-+        	    AC_MSG_ERROR([Valgrind needs a Linux kernel >= 2.6])
-         	    ;;
-+
-+             *)
-+        	    AC_MSG_RESULT([2.6 or later (${kernel})])
-+                    ;;
-         esac
- 
-         ;;
diff --git a/package/devel/valgrind/patches/130-mips_fix_soft_float.patch b/package/devel/valgrind/patches/120-mips_fix_soft_float.patch
index e1d387c5a8..1cf5aeca02 100644
--- a/package/devel/valgrind/patches/130-mips_fix_soft_float.patch
+++ b/package/devel/valgrind/patches/120-mips_fix_soft_float.patch
@@ -1,6 +1,6 @@
 --- a/VEX/priv/guest_mips_helpers.c
 +++ b/VEX/priv/guest_mips_helpers.c
-@@ -1189,6 +1189,7 @@ extern UInt mips_dirtyhelper_calculate_F
+@@ -1201,6 +1201,7 @@ extern UInt mips_dirtyhelper_calculate_F
                                                     flt_op inst )
  {
     UInt ret = 0;
@@ -8,7 +8,7 @@
  #if defined(__mips__)
     VexGuestMIPS32State* guest_state = (VexGuestMIPS32State*)gs;
     UInt loFsVal, hiFsVal, loFtVal, hiFtVal;
-@@ -1308,6 +1309,7 @@ extern UInt mips_dirtyhelper_calculate_F
+@@ -1320,6 +1321,7 @@ extern UInt mips_dirtyhelper_calculate_F
           break;
     }
  #endif
@@ -16,7 +16,7 @@
     return ret;
  }
  
-@@ -1317,6 +1319,7 @@ extern UInt mips_dirtyhelper_calculate_F
+@@ -1329,6 +1331,7 @@ extern UInt mips_dirtyhelper_calculate_F
                                                     flt_op inst )
  {
     UInt ret = 0;
@@ -24,7 +24,7 @@
  #if defined(__mips__)
  #if defined(VGA_mips32)
     VexGuestMIPS32State* guest_state = (VexGuestMIPS32State*)gs;
-@@ -1427,6 +1430,7 @@ extern UInt mips_dirtyhelper_calculate_F
+@@ -1439,6 +1442,7 @@ extern UInt mips_dirtyhelper_calculate_F
           break;
     }
  #endif
diff --git a/package/devel/valgrind/patches/130-fix_arm_arch_detection.patch b/package/devel/valgrind/patches/130-fix_arm_arch_detection.patch
new file mode 100644
index 0000000000..c8d203390c
--- /dev/null
+++ b/package/devel/valgrind/patches/130-fix_arm_arch_detection.patch
@@ -0,0 +1,17 @@
+Description: Fix FTBFS on armhf by correctly detecting the architecture
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/730844
+Author: Alessandro Ghedini <ghedo@debian.org>
+Last-Update: 2013-11-30
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -234,7 +234,7 @@ case "${host_cpu}" in
+         ARCH_MAX="s390x"
+         ;;
+ 
+-     armv7*)
++     arm*)
+ 	AC_MSG_RESULT([ok (${host_cpu})])
+ 	ARCH_MAX="arm"
+ 	;;
diff --git a/package/devel/valgrind/patches/200-musl_fix.patch b/package/devel/valgrind/patches/200-musl_fix.patch
index e61e822b25..23d74e0caf 100644
--- a/package/devel/valgrind/patches/200-musl_fix.patch
+++ b/package/devel/valgrind/patches/200-musl_fix.patch
@@ -6,21 +6,21 @@
  {
 -#  if !defined(__UCLIBC__) \
 +#  if !defined(__UCLIBC__) && defined(__GLIBC__) \
-    && !defined(VGPV_arm_linux_android) && !defined(VGPV_x86_linux_android) \
-    && !defined(VGPV_mips32_linux_android)
-    extern void __libc_freeres(void);
+       && !defined(VGPV_arm_linux_android) \
+       && !defined(VGPV_x86_linux_android) \
+       && !defined(VGPV_mips32_linux_android) \
 --- a/include/pub_tool_redir.h
 +++ b/include/pub_tool_redir.h
-@@ -241,7 +241,7 @@
+@@ -242,7 +242,7 @@
  /* --- Soname of the standard C library. --- */
  
- #if defined(VGO_linux)
+ #if defined(VGO_linux) || defined(VGO_solaris)
 -#  define  VG_Z_LIBC_SONAME  libcZdsoZa              // libc.so*
 +#  define  VG_Z_LIBC_SONAME  libcZdZa                // libc.*
  
  #elif defined(VGO_darwin) && (DARWIN_VERS <= DARWIN_10_6)
  #  define  VG_Z_LIBC_SONAME  libSystemZdZaZddylib    // libSystem.*.dylib
-@@ -273,7 +273,11 @@
+@@ -274,7 +274,11 @@
  /* --- Soname of the pthreads library. --- */
  
  #if defined(VGO_linux)
@@ -31,15 +31,15 @@
 +# endif
  #elif defined(VGO_darwin)
  #  define  VG_Z_LIBPTHREAD_SONAME  libSystemZdZaZddylib  // libSystem.*.dylib
- #else
+ #elif defined(VGO_solaris)
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1025,8 +1025,6 @@ case "${GLIBC_VERSION}" in
- 
-      *)
+@@ -1066,8 +1066,6 @@ case "${GLIBC_VERSION}" in
+ 	;;
+      2.0|2.1|*)
  	AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
--	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.19])
--	AC_MSG_ERROR([or Darwin or Bionic libc])
+-	AC_MSG_ERROR([Valgrind requires glibc version 2.2 or later,])
+-	AC_MSG_ERROR([Darwin libc, Bionic libc or Solaris libc])
  	;;
  esac
  
diff --git a/package/kernel/mwlwifi/Makefile b/package/kernel/mwlwifi/Makefile
index 074104b913..880803e55e 100644
--- a/package/kernel/mwlwifi/Makefile
+++ b/package/kernel/mwlwifi/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mwlwifi
-PKG_VERSION:=10.3.0.17-20160324
+PKG_VERSION:=10.3.0.17-20160617
 PKG_RELEASE=1
 
 PKG_LICENSE:=ISC
@@ -17,7 +17,7 @@ PKG_LICENSE_FILES:=
 PKG_SOURCE_URL:=https://github.com/kaloz/mwlwifi
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=6988b67d9af987a7ba47f82cdaa6c9107e55ec3f
+PKG_SOURCE_VERSION:=b7aff3c2839b048407d716d1cb9326122ee401f8
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
 
 PKG_MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
diff --git a/package/kernel/mwlwifi/patches/100-drop_old_api.patch b/package/kernel/mwlwifi/patches/100-drop_old_api.patch
deleted file mode 100644
index d2e149e9a2..0000000000
--- a/package/kernel/mwlwifi/patches/100-drop_old_api.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- a/main.c
-+++ b/main.c
-@@ -418,11 +418,7 @@ static void mwl_set_ht_caps(struct mwl_p
- 	band->ht_cap.cap |= IEEE80211_HT_CAP_SGI_20;
- 	band->ht_cap.cap |= IEEE80211_HT_CAP_SGI_40;
- 
--#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0)
--	hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION;
--#else
- 	ieee80211_hw_set(hw, AMPDU_AGGREGATION);
--#endif
- 	band->ht_cap.ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K;
- 	band->ht_cap.ampdu_density = IEEE80211_HT_MPDU_DENSITY_4;
- 
-@@ -524,29 +520,16 @@ static int mwl_wl_init(struct mwl_priv *
- 	hw->queues = SYSADPT_TX_WMM_QUEUES;
- 
- 	/* Set rssi values to dBm */
--#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0)
--	hw->flags |= IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_HAS_RATE_CONTROL;
--#else
- 	ieee80211_hw_set(hw, SIGNAL_DBM);
- 	ieee80211_hw_set(hw, HAS_RATE_CONTROL);
--#endif
- 
- 	/* Ask mac80211 not to trigger PS mode
- 	 * based on PM bit of incoming frames.
- 	 */
--#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0)
--	hw->flags |= IEEE80211_HW_AP_LINK_PS;
--#else
- 	ieee80211_hw_set(hw, AP_LINK_PS);
--#endif
- 
--#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0)
--	hw->flags |= IEEE80211_HW_SUPPORTS_PER_STA_GTK |
--		     IEEE80211_HW_MFP_CAPABLE;
--#else
- 	ieee80211_hw_set(hw, SUPPORTS_PER_STA_GTK);
- 	ieee80211_hw_set(hw, MFP_CAPABLE);
--#endif
- 
- 	hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
- 
---- a/dev.h
-+++ b/dev.h
-@@ -484,10 +484,6 @@ static inline struct mwl_sta *mwl_dev_ge
- 	return (struct mwl_sta *)&sta->drv_priv;
- }
- 
--#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0)
--#define ether_addr_copy(dst, src) memcpy(dst, src, ETH_ALEN)
--#endif
--
- /* Defined in mac80211.c. */
- extern const struct ieee80211_ops mwl_mac80211_ops;
- 
---- a/mac80211.c
-+++ b/mac80211.c
-@@ -572,19 +572,11 @@ static int mwl_mac80211_get_survey(struc
- 	return 0;
- }
- 
--#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
--static int mwl_mac80211_ampdu_action(struct ieee80211_hw *hw,
--				     struct ieee80211_vif *vif,
--				     enum ieee80211_ampdu_mlme_action action,
--				     struct ieee80211_sta *sta,
--				     u16 tid, u16 *ssn, u8 buf_size)
--#else
- static int mwl_mac80211_ampdu_action(struct ieee80211_hw *hw,
- 				     struct ieee80211_vif *vif,
- 				     enum ieee80211_ampdu_mlme_action action,
- 				     struct ieee80211_sta *sta,
- 				     u16 tid, u16 *ssn, u8 buf_size, bool amsdu)
--#endif
- {
- 	int rc = 0;
- 	struct mwl_priv *priv = hw->priv;
---- a/rx.c
-+++ b/rx.c
-@@ -232,10 +232,8 @@ static inline void mwl_rx_prepare_status
- 		status->flag |= RX_FLAG_VHT;
- 		if (bw == RX_RATE_INFO_HT40)
- 			status->flag |= RX_FLAG_40MHZ;
--#if LINUX_VERSION_CODE > KERNEL_VERSION(3, 18, 0)
- 		if (bw == RX_RATE_INFO_HT80)
- 			status->vht_flag |= RX_VHT_FLAG_80MHZ;
--#endif
- 		if (gi == RX_RATE_INFO_SHORT_INTERVAL)
- 			status->flag |= RX_FLAG_SHORT_GI;
- 		status->vht_nss = (nss + 1);
diff --git a/package/kernel/mwlwifi/patches/110-api_sync.patch b/package/kernel/mwlwifi/patches/110-api_sync.patch
deleted file mode 100644
index 920cb8cd66..0000000000
--- a/package/kernel/mwlwifi/patches/110-api_sync.patch
+++ /dev/null
@@ -1,267 +0,0 @@
---- a/mac80211.c
-+++ b/mac80211.c
-@@ -260,12 +260,12 @@ static int mwl_mac80211_config(struct ie
- 	if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
- 		int rate = 0;
- 
--		if (conf->chandef.chan->band == IEEE80211_BAND_2GHZ) {
-+		if (conf->chandef.chan->band == NL80211_BAND_2GHZ) {
- 			mwl_fwcmd_set_apmode(hw, AP_MODE_2_4GHZ_11AC_MIXED);
- 			mwl_fwcmd_set_linkadapt_cs_mode(hw,
- 							LINK_CS_STATE_CONSERV);
- 			rate = mwl_rates_24[0].hw_value;
--		} else if (conf->chandef.chan->band == IEEE80211_BAND_5GHZ) {
-+		} else if (conf->chandef.chan->band == NL80211_BAND_5GHZ) {
- 			mwl_fwcmd_set_apmode(hw, AP_MODE_11AC);
- 			mwl_fwcmd_set_linkadapt_cs_mode(hw,
- 							LINK_CS_STATE_AUTO);
-@@ -333,7 +333,7 @@ static void mwl_mac80211_bss_info_change
- 		if (idx)
- 			idx--;
- 
--		if (hw->conf.chandef.chan->band == IEEE80211_BAND_2GHZ)
-+		if (hw->conf.chandef.chan->band == NL80211_BAND_2GHZ)
- 			rate = mwl_rates_24[idx].hw_value;
- 		else
- 			rate = mwl_rates_50[idx].hw_value;
-@@ -600,10 +600,13 @@ static int mwl_mac80211_get_survey(struc
- 
- static int mwl_mac80211_ampdu_action(struct ieee80211_hw *hw,
- 				     struct ieee80211_vif *vif,
--				     enum ieee80211_ampdu_mlme_action action,
--				     struct ieee80211_sta *sta,
--				     u16 tid, u16 *ssn, u8 buf_size, bool amsdu)
-+				     struct ieee80211_ampdu_params *params)
- {
-+	enum ieee80211_ampdu_mlme_action action = params->action;
-+	struct ieee80211_sta *sta = params->sta;
-+	u16 tid = params->tid;
-+	u16 *ssn = &params->ssn;
-+	u8 buf_size = params->buf_size;
- 	int rc = 0;
- 	struct mwl_priv *priv = hw->priv;
- 	struct mwl_ampdu_stream *stream;
---- a/fwcmd.c
-+++ b/fwcmd.c
-@@ -730,9 +730,9 @@ static int mwl_fwcmd_set_country_code(st
- 	bool enable = false;
- 
- 	if (b_inf->ie_country_ptr) {
--		if (bss_conf->chandef.chan->band == IEEE80211_BAND_2GHZ)
-+		if (bss_conf->chandef.chan->band == NL80211_BAND_2GHZ)
- 			a_band = false;
--		else if (bss_conf->chandef.chan->band == IEEE80211_BAND_5GHZ)
-+		else if (bss_conf->chandef.chan->band == NL80211_BAND_5GHZ)
- 			a_band = true;
- 		else
- 			return -EINVAL;
-@@ -1075,9 +1075,9 @@ int mwl_fwcmd_max_tx_power(struct ieee80
- 		break;
- 	}
- 
--	if (channel->band == IEEE80211_BAND_2GHZ)
-+	if (channel->band == NL80211_BAND_2GHZ)
- 		band = FREQ_BAND_2DOT4GHZ;
--	else if (channel->band == IEEE80211_BAND_5GHZ)
-+	else if (channel->band == NL80211_BAND_5GHZ)
- 		band = FREQ_BAND_5GHZ;
- 
- 	switch (conf->chandef.width) {
-@@ -1161,9 +1161,9 @@ int mwl_fwcmd_tx_power(struct ieee80211_
- 		break;
- 	}
- 
--	if (channel->band == IEEE80211_BAND_2GHZ)
-+	if (channel->band == NL80211_BAND_2GHZ)
- 		band = FREQ_BAND_2DOT4GHZ;
--	else if (channel->band == IEEE80211_BAND_5GHZ)
-+	else if (channel->band == NL80211_BAND_5GHZ)
- 		band = FREQ_BAND_5GHZ;
- 
- 	switch (conf->chandef.width) {
-@@ -1354,9 +1354,9 @@ int mwl_fwcmd_set_rf_channel(struct ieee
- 	pcmd->action = cpu_to_le16(WL_SET);
- 	pcmd->curr_chnl = channel->hw_value;
- 
--	if (channel->band == IEEE80211_BAND_2GHZ) {
-+	if (channel->band == NL80211_BAND_2GHZ) {
- 		freq_band = FREQ_BAND_2DOT4GHZ;
--	} else if (channel->band == IEEE80211_BAND_5GHZ) {
-+	} else if (channel->band == NL80211_BAND_5GHZ) {
- 		freq_band = FREQ_BAND_5GHZ;
- 	} else {
- 		mutex_unlock(&priv->fwcmd_mutex);
-@@ -1923,10 +1923,10 @@ int mwl_fwcmd_set_new_stn_add(struct iee
- 	}
- 	ether_addr_copy(pcmd->mac_addr, sta->addr);
- 
--	if (hw->conf.chandef.chan->band == IEEE80211_BAND_2GHZ)
--		rates = sta->supp_rates[IEEE80211_BAND_2GHZ];
-+	if (hw->conf.chandef.chan->band == NL80211_BAND_2GHZ)
-+		rates = sta->supp_rates[NL80211_BAND_2GHZ];
- 	else
--		rates = sta->supp_rates[IEEE80211_BAND_5GHZ] << 5;
-+		rates = sta->supp_rates[NL80211_BAND_5GHZ] << 5;
- 	pcmd->peer_info.legacy_rate_bitmap = cpu_to_le32(rates);
- 
- 	if (sta->ht_cap.ht_supported) {
-@@ -2097,9 +2097,9 @@ int mwl_fwcmd_set_switch_channel(struct
- 	if (priv->csa_active)
- 		return 0;
- 
--	if (channel->band == IEEE80211_BAND_2GHZ)
-+	if (channel->band == NL80211_BAND_2GHZ)
- 		freq_band = FREQ_BAND_2DOT4GHZ;
--	else if (channel->band == IEEE80211_BAND_5GHZ)
-+	else if (channel->band == NL80211_BAND_5GHZ)
- 		freq_band = FREQ_BAND_5GHZ;
- 	else
- 		return -EINVAL;
---- a/main.c
-+++ b/main.c
-@@ -63,20 +63,20 @@ static struct mwl_chip_info mwl_chip_tbl
- };
- 
- static const struct ieee80211_channel mwl_channels_24[] = {
--	{ .band = IEEE80211_BAND_2GHZ, .center_freq = 2412, .hw_value = 1, },
--	{ .band = IEEE80211_BAND_2GHZ, .center_freq = 2417, .hw_value = 2, },
--	{ .band = IEEE80211_BAND_2GHZ, .center_freq = 2422, .hw_value = 3, },
--	{ .band = IEEE80211_BAND_2GHZ, .center_freq = 2427, .hw_value = 4, },
--	{ .band = IEEE80211_BAND_2GHZ, .center_freq = 2432, .hw_value = 5, },
--	{ .band = IEEE80211_BAND_2GHZ, .center_freq = 2437, .hw_value = 6, },
--	{ .band = IEEE80211_BAND_2GHZ, .center_freq = 2442, .hw_value = 7, },
--	{ .band = IEEE80211_BAND_2GHZ, .center_freq = 2447, .hw_value = 8, },
--	{ .band = IEEE80211_BAND_2GHZ, .center_freq = 2452, .hw_value = 9, },
--	{ .band = IEEE80211_BAND_2GHZ, .center_freq = 2457, .hw_value = 10, },
--	{ .band = IEEE80211_BAND_2GHZ, .center_freq = 2462, .hw_value = 11, },
--	{ .band = IEEE80211_BAND_2GHZ, .center_freq = 2467, .hw_value = 12, },
--	{ .band = IEEE80211_BAND_2GHZ, .center_freq = 2472, .hw_value = 13, },
--	{ .band = IEEE80211_BAND_2GHZ, .center_freq = 2484, .hw_value = 14, },
-+	{ .band = NL80211_BAND_2GHZ, .center_freq = 2412, .hw_value = 1, },
-+	{ .band = NL80211_BAND_2GHZ, .center_freq = 2417, .hw_value = 2, },
-+	{ .band = NL80211_BAND_2GHZ, .center_freq = 2422, .hw_value = 3, },
-+	{ .band = NL80211_BAND_2GHZ, .center_freq = 2427, .hw_value = 4, },
-+	{ .band = NL80211_BAND_2GHZ, .center_freq = 2432, .hw_value = 5, },
-+	{ .band = NL80211_BAND_2GHZ, .center_freq = 2437, .hw_value = 6, },
-+	{ .band = NL80211_BAND_2GHZ, .center_freq = 2442, .hw_value = 7, },
-+	{ .band = NL80211_BAND_2GHZ, .center_freq = 2447, .hw_value = 8, },
-+	{ .band = NL80211_BAND_2GHZ, .center_freq = 2452, .hw_value = 9, },
-+	{ .band = NL80211_BAND_2GHZ, .center_freq = 2457, .hw_value = 10, },
-+	{ .band = NL80211_BAND_2GHZ, .center_freq = 2462, .hw_value = 11, },
-+	{ .band = NL80211_BAND_2GHZ, .center_freq = 2467, .hw_value = 12, },
-+	{ .band = NL80211_BAND_2GHZ, .center_freq = 2472, .hw_value = 13, },
-+	{ .band = NL80211_BAND_2GHZ, .center_freq = 2484, .hw_value = 14, },
- };
- 
- static const struct ieee80211_rate mwl_rates_24[] = {
-@@ -96,30 +96,30 @@ static const struct ieee80211_rate mwl_r
- };
- 
- static const struct ieee80211_channel mwl_channels_50[] = {
--	{ .band = IEEE80211_BAND_5GHZ, .center_freq = 5180, .hw_value = 36, },
--	{ .band = IEEE80211_BAND_5GHZ, .center_freq = 5200, .hw_value = 40, },
--	{ .band = IEEE80211_BAND_5GHZ, .center_freq = 5220, .hw_value = 44, },
--	{ .band = IEEE80211_BAND_5GHZ, .center_freq = 5240, .hw_value = 48, },
--	{ .band = IEEE80211_BAND_5GHZ, .center_freq = 5260, .hw_value = 52, },
--	{ .band = IEEE80211_BAND_5GHZ, .center_freq = 5280, .hw_value = 56, },
--	{ .band = IEEE80211_BAND_5GHZ, .center_freq = 5300, .hw_value = 60, },
--	{ .band = IEEE80211_BAND_5GHZ, .center_freq = 5320, .hw_value = 64, },
--	{ .band = IEEE80211_BAND_5GHZ, .center_freq = 5500, .hw_value = 100, },
--	{ .band = IEEE80211_BAND_5GHZ, .center_freq = 5520, .hw_value = 104, },
--	{ .band = IEEE80211_BAND_5GHZ, .center_freq = 5540, .hw_value = 108, },
--	{ .band = IEEE80211_BAND_5GHZ, .center_freq = 5560, .hw_value = 112, },
--	{ .band = IEEE80211_BAND_5GHZ, .center_freq = 5580, .hw_value = 116, },
--	{ .band = IEEE80211_BAND_5GHZ, .center_freq = 5600, .hw_value = 120, },
--	{ .band = IEEE80211_BAND_5GHZ, .center_freq = 5620, .hw_value = 124, },
--	{ .band = IEEE80211_BAND_5GHZ, .center_freq = 5640, .hw_value = 128, },
--	{ .band = IEEE80211_BAND_5GHZ, .center_freq = 5660, .hw_value = 132, },
--	{ .band = IEEE80211_BAND_5GHZ, .center_freq = 5680, .hw_value = 136, },
--	{ .band = IEEE80211_BAND_5GHZ, .center_freq = 5700, .hw_value = 140, },
--	{ .band = IEEE80211_BAND_5GHZ, .center_freq = 5720, .hw_value = 144, },
--	{ .band = IEEE80211_BAND_5GHZ, .center_freq = 5745, .hw_value = 149, },
--	{ .band = IEEE80211_BAND_5GHZ, .center_freq = 5765, .hw_value = 153, },
--	{ .band = IEEE80211_BAND_5GHZ, .center_freq = 5785, .hw_value = 157, },
--	{ .band = IEEE80211_BAND_5GHZ, .center_freq = 5805, .hw_value = 161, },
-+	{ .band = NL80211_BAND_5GHZ, .center_freq = 5180, .hw_value = 36, },
-+	{ .band = NL80211_BAND_5GHZ, .center_freq = 5200, .hw_value = 40, },
-+	{ .band = NL80211_BAND_5GHZ, .center_freq = 5220, .hw_value = 44, },
-+	{ .band = NL80211_BAND_5GHZ, .center_freq = 5240, .hw_value = 48, },
-+	{ .band = NL80211_BAND_5GHZ, .center_freq = 5260, .hw_value = 52, },
-+	{ .band = NL80211_BAND_5GHZ, .center_freq = 5280, .hw_value = 56, },
-+	{ .band = NL80211_BAND_5GHZ, .center_freq = 5300, .hw_value = 60, },
-+	{ .band = NL80211_BAND_5GHZ, .center_freq = 5320, .hw_value = 64, },
-+	{ .band = NL80211_BAND_5GHZ, .center_freq = 5500, .hw_value = 100, },
-+	{ .band = NL80211_BAND_5GHZ, .center_freq = 5520, .hw_value = 104, },
-+	{ .band = NL80211_BAND_5GHZ, .center_freq = 5540, .hw_value = 108, },
-+	{ .band = NL80211_BAND_5GHZ, .center_freq = 5560, .hw_value = 112, },
-+	{ .band = NL80211_BAND_5GHZ, .center_freq = 5580, .hw_value = 116, },
-+	{ .band = NL80211_BAND_5GHZ, .center_freq = 5600, .hw_value = 120, },
-+	{ .band = NL80211_BAND_5GHZ, .center_freq = 5620, .hw_value = 124, },
-+	{ .band = NL80211_BAND_5GHZ, .center_freq = 5640, .hw_value = 128, },
-+	{ .band = NL80211_BAND_5GHZ, .center_freq = 5660, .hw_value = 132, },
-+	{ .band = NL80211_BAND_5GHZ, .center_freq = 5680, .hw_value = 136, },
-+	{ .band = NL80211_BAND_5GHZ, .center_freq = 5700, .hw_value = 140, },
-+	{ .band = NL80211_BAND_5GHZ, .center_freq = 5720, .hw_value = 144, },
-+	{ .band = NL80211_BAND_5GHZ, .center_freq = 5745, .hw_value = 149, },
-+	{ .band = NL80211_BAND_5GHZ, .center_freq = 5765, .hw_value = 153, },
-+	{ .band = NL80211_BAND_5GHZ, .center_freq = 5785, .hw_value = 157, },
-+	{ .band = NL80211_BAND_5GHZ, .center_freq = 5805, .hw_value = 161, },
- };
- 
- static const struct ieee80211_rate mwl_rates_50[] = {
-@@ -478,7 +478,7 @@ static void mwl_set_caps(struct mwl_priv
- 		BUILD_BUG_ON(sizeof(priv->rates_24) != sizeof(mwl_rates_24));
- 		memcpy(priv->rates_24, mwl_rates_24, sizeof(mwl_rates_24));
- 
--		priv->band_24.band = IEEE80211_BAND_2GHZ;
-+		priv->band_24.band = NL80211_BAND_2GHZ;
- 		priv->band_24.channels = priv->channels_24;
- 		priv->band_24.n_channels = ARRAY_SIZE(mwl_channels_24);
- 		priv->band_24.bitrates = priv->rates_24;
-@@ -487,7 +487,7 @@ static void mwl_set_caps(struct mwl_priv
- 		mwl_set_ht_caps(priv, &priv->band_24);
- 		mwl_set_vht_caps(priv, &priv->band_24);
- 
--		hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &priv->band_24;
-+		hw->wiphy->bands[NL80211_BAND_2GHZ] = &priv->band_24;
- 	}
- 
- 	/* set up band information for 5G */
-@@ -500,7 +500,7 @@ static void mwl_set_caps(struct mwl_priv
- 		BUILD_BUG_ON(sizeof(priv->rates_50) != sizeof(mwl_rates_50));
- 		memcpy(priv->rates_50, mwl_rates_50, sizeof(mwl_rates_50));
- 
--		priv->band_50.band = IEEE80211_BAND_5GHZ;
-+		priv->band_50.band = NL80211_BAND_5GHZ;
- 		priv->band_50.channels = priv->channels_50;
- 		priv->band_50.n_channels = ARRAY_SIZE(mwl_channels_50);
- 		priv->band_50.bitrates = priv->rates_50;
-@@ -509,7 +509,7 @@ static void mwl_set_caps(struct mwl_priv
- 		mwl_set_ht_caps(priv, &priv->band_50);
- 		mwl_set_vht_caps(priv, &priv->band_50);
- 
--		hw->wiphy->bands[IEEE80211_BAND_5GHZ] = &priv->band_50;
-+		hw->wiphy->bands[NL80211_BAND_5GHZ] = &priv->band_50;
- 	}
- }
- 
---- a/rx.c
-+++ b/rx.c
-@@ -243,7 +243,7 @@ static inline void mwl_rx_prepare_status
- 	status->rate_idx = rt;
- 
- 	if (pdesc->channel > BAND_24_CHANNEL_NUM) {
--		status->band = IEEE80211_BAND_5GHZ;
-+		status->band = NL80211_BAND_5GHZ;
- 		if ((!(status->flag & RX_FLAG_HT)) &&
- 		    (!(status->flag & RX_FLAG_VHT))) {
- 			status->rate_idx -= 5;
-@@ -251,7 +251,7 @@ static inline void mwl_rx_prepare_status
- 				status->rate_idx = BAND_50_RATE_NUM - 1;
- 		}
- 	} else {
--		status->band = IEEE80211_BAND_2GHZ;
-+		status->band = NL80211_BAND_2GHZ;
- 		if ((!(status->flag & RX_FLAG_HT)) &&
- 		    (!(status->flag & RX_FLAG_VHT))) {
- 			if (status->rate_idx >= BAND_24_RATE_NUM)
diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile
index 13299cf273..816f47004a 100644
--- a/package/libs/mbedtls/Makefile
+++ b/package/libs/mbedtls/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mbedtls
-PKG_VERSION:=2.2.1
-PKG_RELEASE:=1
+PKG_VERSION:=2.3.0
+PKG_RELEASE:=2
 PKG_USE_MIPS16:=0
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-gpl.tgz
 PKG_SOURCE_URL:=https://tls.mbed.org/download/
-PKG_MD5SUM:=bb1bffa3ac5ab143be2aae3d45a7a92b36112888ef465024d83724865fe62974
+PKG_MD5SUM:=21237014f779bde70b2d71399cc1ea53365eb7f10cdd74a13ee6329a1910cb49
 
 PKG_BUILD_PARALLEL:=1
 PKG_LICENSE:=GPL-2.0+
diff --git a/package/libs/mbedtls/patches/001-Fixes_missing_dependency_in_ssl.patch b/package/libs/mbedtls/patches/001-Fixes_missing_dependency_in_ssl.patch
new file mode 100644
index 0000000000..0090885c0d
--- /dev/null
+++ b/package/libs/mbedtls/patches/001-Fixes_missing_dependency_in_ssl.patch
@@ -0,0 +1,21 @@
+From 7247f99b3e068a2b90b7776a2cdd438fddb7a38b Mon Sep 17 00:00:00 2001
+From: James Cowgill <james410@cowgill.org.uk>
+Date: Mon, 11 Jul 2016 13:57:05 +0100
+Subject: [PATCH] Fixes missing dependency in ss.h on platform.h
+
+Fixes #522 - 'mbedtls_time_t does not name a type in ssl.h'
+---
+ include/mbedtls/ssl.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/mbedtls/ssl.h
++++ b/include/mbedtls/ssl.h
+@@ -54,7 +54,7 @@
+ #endif
+ 
+ #if defined(MBEDTLS_HAVE_TIME)
+-#include <time.h>
++#include "platform.h"
+ #endif
+ 
+ /*
diff --git a/package/libs/mbedtls/patches/200-config.patch b/package/libs/mbedtls/patches/200-config.patch
index a3e393e402..e4118ff3ef 100644
--- a/package/libs/mbedtls/patches/200-config.patch
+++ b/package/libs/mbedtls/patches/200-config.patch
@@ -1,6 +1,6 @@
 --- a/include/mbedtls/config.h
 +++ b/include/mbedtls/config.h
-@@ -183,7 +183,7 @@
+@@ -185,7 +185,7 @@
   *
   * Uncomment to get errors on using deprecated functions.
   */
@@ -9,7 +9,7 @@
  
  /* \} name SECTION: System support */
  
-@@ -322,7 +322,7 @@
+@@ -341,7 +341,7 @@
   *
   * Enable Cipher Feedback mode (CFB) for symmetric ciphers.
   */
@@ -18,7 +18,7 @@
  
  /**
   * \def MBEDTLS_CIPHER_MODE_CTR
-@@ -416,13 +416,13 @@
+@@ -435,13 +435,13 @@
   *
   * Comment macros to disable the curve and functions for it
   */
@@ -36,7 +36,7 @@
  #define MBEDTLS_ECP_DP_SECP256K1_ENABLED
  #define MBEDTLS_ECP_DP_BP256R1_ENABLED
  #define MBEDTLS_ECP_DP_BP384R1_ENABLED
-@@ -438,7 +438,7 @@
+@@ -457,7 +457,7 @@
   *
   * Comment this macro to disable NIST curves optimisation.
   */
@@ -45,7 +45,7 @@
  
  /**
   * \def MBEDTLS_ECDSA_DETERMINISTIC
-@@ -498,7 +498,7 @@
+@@ -517,7 +517,7 @@
   *      MBEDTLS_TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA
   *      MBEDTLS_TLS_DHE_PSK_WITH_RC4_128_SHA
   */
@@ -54,7 +54,7 @@
  
  /**
   * \def MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
-@@ -543,7 +543,7 @@
+@@ -562,7 +562,7 @@
   *      MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
   *      MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
   */
@@ -63,7 +63,7 @@
  
  /**
   * \def MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
-@@ -597,7 +597,7 @@
+@@ -616,7 +616,7 @@
   *      MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA
   *      MBEDTLS_TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
   */
@@ -72,7 +72,7 @@
  
  /**
   * \def MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
-@@ -670,7 +670,7 @@
+@@ -689,7 +689,7 @@
   *      MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
   *      MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
   */
@@ -81,7 +81,7 @@
  
  /**
   * \def MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
-@@ -694,7 +694,7 @@
+@@ -713,7 +713,7 @@
   *      MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
   *      MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
   */
@@ -90,7 +90,7 @@
  
  /**
   * \def MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
-@@ -832,7 +832,7 @@
+@@ -879,7 +879,7 @@
   *
   * Comment this macro to disable support for external private RSA keys.
   */
@@ -99,7 +99,7 @@
  
  /**
   * \def MBEDTLS_PKCS1_V15
-@@ -864,14 +864,14 @@
+@@ -911,14 +911,14 @@
   * Uncomment this macro to disable the use of CRT in RSA.
   *
   */
@@ -116,7 +116,7 @@
  
  /**
   * \def MBEDTLS_SHA256_SMALLER
-@@ -887,7 +887,7 @@
+@@ -934,7 +934,7 @@
   *
   * Uncomment to enable the smaller implementation of SHA256.
   */
@@ -125,16 +125,7 @@
  
  /**
   * \def MBEDTLS_SSL_AEAD_RANDOM_IV
-@@ -1060,7 +1060,7 @@
-  *
-  * Comment this macro to disable support for SSL 3.0
-  */
--#define MBEDTLS_SSL_PROTO_SSL3
-+//#define MBEDTLS_SSL_PROTO_SSL3
- 
- /**
-  * \def MBEDTLS_SSL_PROTO_TLS1
-@@ -1224,7 +1224,7 @@
+@@ -1271,7 +1271,7 @@
   *
   * Comment this macro to disable support for truncated HMAC in SSL
   */
@@ -143,7 +134,7 @@
  
  /**
   * \def MBEDTLS_THREADING_ALT
-@@ -1460,7 +1460,7 @@
+@@ -1507,7 +1507,7 @@
   *      MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
   *      MBEDTLS_TLS_PSK_WITH_RC4_128_SHA
   */
@@ -152,7 +143,7 @@
  
  /**
   * \def MBEDTLS_ASN1_PARSE_C
-@@ -1525,7 +1525,7 @@
+@@ -1572,7 +1572,7 @@
   *
   * Module:  library/blowfish.c
   */
@@ -161,7 +152,7 @@
  
  /**
   * \def MBEDTLS_CAMELLIA_C
-@@ -1580,7 +1580,7 @@
+@@ -1627,7 +1627,7 @@
   *      MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
   *      MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
   */
@@ -170,7 +161,7 @@
  
  /**
   * \def MBEDTLS_CCM_C
-@@ -1594,7 +1594,7 @@
+@@ -1641,7 +1641,7 @@
   * This module enables the AES-CCM ciphersuites, if other requisites are
   * enabled as well.
   */
@@ -179,7 +170,7 @@
  
  /**
   * \def MBEDTLS_CERTS_C
-@@ -1606,7 +1606,7 @@
+@@ -1653,7 +1653,7 @@
   *
   * This module is used for testing (ssl_client/server).
   */
@@ -188,7 +179,7 @@
  
  /**
   * \def MBEDTLS_CIPHER_C
-@@ -1646,7 +1646,7 @@
+@@ -1693,7 +1693,7 @@
   *
   * This module provides debugging functions.
   */
@@ -197,7 +188,7 @@
  
  /**
   * \def MBEDTLS_DES_C
-@@ -1686,7 +1686,7 @@
+@@ -1733,7 +1733,7 @@
   * This module is used by the following key exchanges:
   *      DHE-RSA, DHE-PSK
   */
@@ -206,7 +197,7 @@
  
  /**
   * \def MBEDTLS_ECDH_C
-@@ -2096,7 +2096,7 @@
+@@ -2151,7 +2151,7 @@
   * Caller:  library/mbedtls_md.c
   *
   */
@@ -215,7 +206,7 @@
  
  /**
   * \def MBEDTLS_RSA_C
-@@ -2394,7 +2394,7 @@
+@@ -2461,7 +2461,7 @@
   * Module:  library/xtea.c
   * Caller:
   */
diff --git a/package/libs/polarssl/Makefile b/package/libs/polarssl/Makefile
index 573966e33b..2f2029f9d8 100644
--- a/package/libs/polarssl/Makefile
+++ b/package/libs/polarssl/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=polarssl
 SRC_PKG_NAME:=mbedtls
-PKG_VERSION:=1.3.16
-PKG_RELEASE:=2
+PKG_VERSION:=1.3.17
+PKG_RELEASE:=1
 PKG_USE_MIPS16:=0
 
 PKG_SOURCE:=$(SRC_PKG_NAME)-$(PKG_VERSION)-gpl.tgz
-PKG_SOURCE_URL:=https://polarssl.org/download/
-PKG_MD5SUM:=f413146c177c52d4ad8f48015e2fb21dd3a029ca30a2ea000cbc4f9bd092c933
+PKG_SOURCE_URL:=https://tls.mbed.org/download/
+PKG_MD5SUM:=f5beb43e850283915e3e0f8d37495eade3bfb5beedfb61e7b8da70d4c68edb82
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(SRC_PKG_NAME)-$(PKG_VERSION)
 
diff --git a/package/libs/polarssl/patches/100-disable_sslv3.patch b/package/libs/polarssl/patches/100-disable_sslv3.patch
deleted file mode 100644
index 56c6c4d235..0000000000
--- a/package/libs/polarssl/patches/100-disable_sslv3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/include/polarssl/config.h
-+++ b/include/polarssl/config.h
-@@ -1011,8 +1011,8 @@
-  *           POLARSSL_SHA1_C
-  *
-  * Comment this macro to disable support for SSL 3.0
-- */
- #define POLARSSL_SSL_PROTO_SSL3
-+ */
- 
- /**
-  * \def POLARSSL_SSL_PROTO_TLS1
diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile
index 514eedd885..82fcb3e48e 100644
--- a/package/network/config/netifd/Makefile
+++ b/package/network/config/netifd/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netifd
-PKG_VERSION:=2016-03-31
+PKG_VERSION:=2016-06-06
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(OPENWRT_GIT)/project/netifd.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=39d9ceeb96162a83a3f5fa63e6aaa1ccb38caa62
+PKG_SOURCE_VERSION:=99e6dc68bbac5a57a0ebca810a9dc36e38667821
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 # PKG_MIRROR_MD5SUM:=
diff --git a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
index 7f4af25329..abfdaaffdd 100755
--- a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
+++ b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
@@ -54,10 +54,10 @@ proto_dhcp_setup() {
 	proto_run_command "$config" udhcpc \
 		-p /var/run/udhcpc-$iface.pid \
 		-s /lib/netifd/dhcp.script \
-		-f -R -t 0 -i "$iface" \
+		-f -t 0 -i "$iface" \
 		${ipaddr:+-r $ipaddr} \
-		${hostname:+-H $hostname} \
-		${vendorid:+-V $vendorid} \
+		${hostname:+-H "$hostname"} \
+		${vendorid:+-V "$vendorid"} \
 		$clientid $broadcast $release $dhcpopts
 }
 
diff --git a/package/network/services/igmpproxy/Makefile b/package/network/services/igmpproxy/Makefile
index 0ad85561c1..8d4da5ca9e 100644
--- a/package/network/services/igmpproxy/Makefile
+++ b/package/network/services/igmpproxy/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=igmpproxy
 PKG_VERSION:=0.1
-PKG_RELEASE:=8
+PKG_RELEASE:=9
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/igmpproxy
diff --git a/package/network/services/igmpproxy/files/igmpproxy.config b/package/network/services/igmpproxy/files/igmpproxy.config
index d2906329d6..d89013ca98 100644
--- a/package/network/services/igmpproxy/files/igmpproxy.config
+++ b/package/network/services/igmpproxy/files/igmpproxy.config
@@ -1,5 +1,6 @@
 config igmpproxy
 	option quickleave 1
+#	option verbose [0-2]
 
 config phyint wan
 	option network wan
diff --git a/package/network/services/igmpproxy/files/igmpproxy.init b/package/network/services/igmpproxy/files/igmpproxy.init
index d03f90f0c8..9e337221f1 100644
--- a/package/network/services/igmpproxy/files/igmpproxy.init
+++ b/package/network/services/igmpproxy/files/igmpproxy.init
@@ -6,24 +6,13 @@ USE_PROCD=1
 PROG=/usr/sbin/igmpproxy
 CONFIGFILE=/var/etc/igmpproxy.conf
 
-# igmpproxy supports both a debug mode and verbosity, which are very useful
-# when something isn't working.
-#
-# Debug mode will print everything to stdout instead of syslog. Generally
-# verbosity should NOT be set as it will quickly fill your syslog.
-#
-# Put any debug or verbosity options into IGMP_OPTS
-#
-# Examples:
-# OPTIONS="-d -v -v" - debug mode and very verbose, this will land in
-#                        stdout and not in syslog
-# OPTIONS="-v" - be verbose, this will write aditional information to syslog
-
-OPTIONS=""
-
 igmp_header() {
-	local quickleave
+	local quickleave verbose
 	config_get_bool quickleave "$1" quickleave 0
+	config_get verbose "$1" verbose 0
+
+	[ $verbose = "1" ] && logopts="-v"
+	[ $verbose = "2" ] && logopts="-v -v"
 
 	mkdir -p /var/etc
 	rm -f /var/etc/igmpproxy.conf
@@ -113,6 +102,7 @@ service_triggers() {
 start_service() {
 	has_upstream=
 	netdevs=
+	logopts=
 	config_load igmpproxy
 
 	config_foreach igmp_header igmpproxy
@@ -121,7 +111,7 @@ start_service() {
 
 	procd_open_instance
 	procd_set_param command $PROG
-	[ -n "$OPTIONS" ] && procd_append_param $OPTIONS
+	[ -n "$logopts" ] && procd_append_param command $logopts
 	procd_append_param command $CONFIGFILE
 	procd_set_param file $CONFIGFILE
 	procd_set_param netdev $netdevs
diff --git a/package/network/utils/iftop/Makefile b/package/network/utils/iftop/Makefile
index bd82f2df94..ef9657560e 100644
--- a/package/network/utils/iftop/Makefile
+++ b/package/network/utils/iftop/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iftop
 PKG_VERSION:=1.0pre4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.ex-parrot.com/~pdw/iftop/download
diff --git a/package/network/utils/iftop/patches/110-fix-mac-display.patch b/package/network/utils/iftop/patches/110-fix-mac-display.patch
new file mode 100644
index 0000000000..5db53aaa52
--- /dev/null
+++ b/package/network/utils/iftop/patches/110-fix-mac-display.patch
@@ -0,0 +1,67 @@
+iftop: fix mac address display
+
+iftop would display portions of mac address with large ffffff prefixes.
+Make if_hw_addr type consistent.
+
+Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
+---
+ addrs_dlpi.c  | 2 +-
+ addrs_ioctl.c | 2 +-
+ addrs_ioctl.h | 2 +-
+ iftop.c       | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/addrs_dlpi.c b/addrs_dlpi.c
+index 188fef8..6c04ea1 100644
+--- a/addrs_dlpi.c
++++ b/addrs_dlpi.c
+@@ -50,7 +50,7 @@ extern char *strncat2(char *dest, char *src, int n);
+  */
+ 
+ int
+-get_addrs_dlpi(char *interface, char if_hw_addr[], struct in_addr *if_ip_addr)
++get_addrs_dlpi(char *interface, u_int8_t if_hw_addr[], struct in_addr *if_ip_addr)
+ {
+   int got_hw_addr = 0;
+   int got_ip_addr = 0;
+diff --git a/addrs_ioctl.c b/addrs_ioctl.c
+index 870c83b..7d01fb2 100644
+--- a/addrs_ioctl.c
++++ b/addrs_ioctl.c
+@@ -45,7 +45,7 @@
+  */
+ 
+ int
+-get_addrs_ioctl(char *interface, char if_hw_addr[], struct in_addr *if_ip_addr, struct in6_addr *if_ip6_addr)
++get_addrs_ioctl(char *interface, u_int8_t if_hw_addr[], struct in_addr *if_ip_addr, struct in6_addr *if_ip6_addr)
+ {
+   int s;
+   struct ifreq ifr = {};
+diff --git a/addrs_ioctl.h b/addrs_ioctl.h
+index f93a0b4..739de61 100644
+--- a/addrs_ioctl.h
++++ b/addrs_ioctl.h
+@@ -7,6 +7,6 @@
+ #define __ADDRS_IOCTL_H_
+ 
+ int
+-get_addrs_ioctl(char *interface, char if_hw_addr[], struct in_addr *if_ip_addr, struct in6_addr *if_ip6_addr);
++get_addrs_ioctl(char *interface, u_int8_t if_hw_addr[], struct in_addr *if_ip_addr, struct in6_addr *if_ip6_addr);
+ 
+ #endif /* __ADDRS_IOCTL_H_ */
+diff --git a/iftop.c b/iftop.c
+index a090dcf..f1b371a 100644
+--- a/iftop.c
++++ b/iftop.c
+@@ -55,7 +55,7 @@
+ 
+ /* ethernet address of interface. */
+ int have_hw_addr = 0;
+-char if_hw_addr[6];    
++u_int8_t if_hw_addr[6];    
+ 
+ /* IP address of interface */
+ int have_ip_addr = 0;
+-- 
+1.9.1
+
diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile
index f9f1ac17f1..2f46f2975b 100644
--- a/package/system/ubox/Makefile
+++ b/package/system/ubox/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ubox
-PKG_VERSION:=2016-03-07
+PKG_VERSION:=2016-07-19
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(OPENWRT_GIT)/project/ubox.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=fd4bb41ee7ab136d25609c2a917beea5d52b723b
+PKG_SOURCE_VERSION:=aead2c0cbffdda9b46d74a998a4c6aeef423b21a
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 CMAKE_INSTALL:=1
 
@@ -37,8 +37,10 @@ endef
 
 define Package/ubox/install
 	$(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/lib/
+	$(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/lib/ $(1)/usr/bin
 
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{kmodloader,validate_data} $(1)/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/getrandom $(1)/usr/bin/
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libvalidate.so $(1)/lib
 
 	$(LN) ../../sbin/kmodloader $(1)/usr/sbin/rmmod
diff --git a/package/system/ubox/files/log.init b/package/system/ubox/files/log.init
index 53c936e246..722dc20e90 100644
--- a/package/system/ubox/files/log.init
+++ b/package/system/ubox/files/log.init
@@ -35,7 +35,7 @@ start_service_daemon()
 	local log_buffer_size log_size
 	validate_log_daemon "${1}"
 	[ $log_buffer_size -eq 0 -a $log_size -gt 0 ] && log_buffer_size=$log_size
-	[ $log_buffer_size -eq 0 ] && log_buffer_size=16
+	[ $log_buffer_size -eq 0 ] && log_buffer_size=64
 	procd_open_instance
 	procd_set_param command "/sbin/logd"
 	procd_append_param command -S "${log_buffer_size}"