Merge branch 'master' of git+ssh://wbx@openadk.org/git/openadk

package/dhcp/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		dhcp
 PKG_VERSION:=		4.1.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		38a74c89d8913b9b5f33737047623c18
 PKG_DESCR:=		ISC DHCP server
 PKG_SECTION:=		net
@@ -27,6 +27,8 @@ post-install:
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/dhcrelay \
 		${IDIR_DHCP_RELAY}/usr/sbin/
 	${INSTALL_DIR} ${IDIR_DHCP_SERVER}/usr/sbin
+	${INSTALL_DIR} ${IDIR_DHCP_SERVER}/etc
+	${INSTALL_DATA} ./files/dhcpd.conf ${IDIR_DHCP_SERVER}/etc
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/dhcpd \
 		${IDIR_DHCP_SERVER}/usr/sbin/
 

package/dhcp/files/dhcpd.conf

@@ -0,0 +1,11 @@
+# basic example configuration
+ddns-update-style none;
+option domain-name "example.org";
+option domain-name-servers ns1.example.org, ns2.example.org;
+default-lease-time 600;
+max-lease-time 7200;
+authoritative;
+
+subnet 192.168.0.0 netmask 255.255.255.0 {
+  range 192.168.0.10 192.168.0.20;
+}

target/linux/config/Config.in.netdevice

@@ -163,6 +163,15 @@ config ADK_MOD_KERNEL_MAC80211
 menu "Wireless card support"
 depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB
 
+config ADK_KERNEL_MAC80211_DEBUG_MENU
+	boolean
+	default n
+
+config ADK_KERNEL_MAC80211_VERBOSE_DEBUG
+	select ADK_KERNEL_MAC80211_DEBUG_MENU
+	boolean
+	default n
+
 config ADK_KPACKAGE_KMOD_MAC80211
 	prompt "kmod-mac80211.................. mac80211 softmac"
 	tristate
@@ -176,6 +185,14 @@ config ADK_KPACKAGE_KMOD_MAC80211
 	select ADK_KERNEL_CRC32
 	default n
 
+config ADK_DEBUG_MAC80211
+	boolean
+	prompt "enable verbose debugging messages in mac80211"
+	select ADK_KERNEL_MAC80211_VERBOSE_DEBUG
+	default n
+	depends on ADK_KPACKAGE_KMOD_MAC80211
+	help
+
 config ADK_KPACKAGE_KMOD_ATH5K
 	prompt "kmod-ath5k................... Atheros 5xxx wireless cards"
 	tristate