K24: fix kernel compilation error

Revert a small change on MLPPP code introduced on commit d4f882d3ce029a14e9f77cd1895fa7352f28cc6f

Signed-off-by: Jean-Yves Avenard <jean-yves@avenard.org>
fix dhcp options for non-VLAN builds

 * based on cherry-picking from branch Toastman-IPT-ND (commit 8466434907c9283e39d94e168850ce6badcec93f)
 * only enforce pushing GW into list of dhcp-otions delivered on builds with VLAN-GUI enabled (i.e. MultiLAN)
 * see http://www.linksysinfo.org/index.php?threads/using-qos-tutorial-and-discussion.28349/page-3#post-138497
 * and http://www.linksysinfo.org/index.php?threads/vlan-tags-work-for-you.34478/page-3#post-170946
Minor multiLAN/wireless bugfixes
Merge branch 'VLAN-GUI' into VLAN-MultiSSID

* VLAN-GUI:
  Minor multiLAN/wireless bugfixes
  fix dhcp options for non-VLAN builds
PPTP Server for Tomato

 * this commit possibly introduces some bugs, but here we go!
 * this version allows up to 6 IPs/users/concurrent connections (ppp4-ppp9)
 * broadcast relay has been included on the webUI, but hasn't been thoroughly tested

 * some references:
 * http://tomatousb.org/tut:configuring-a-pptp-vpn
 * http://www.linksysinfo.org/index.php?threads/the-pptp-gui-thread.36779/#post-179904
 * http://tomatousb.org/forum/t-373620
 * http://abills.net.ua/wiki/doku.php/abills:docs:linux:accel_pptp:ru
 * http://accel-pptp.sourceforge.net/
 * http://service.asus.com/demoui/RT-N66U/RT-N66U/RT-N66U/192.168.1.1/Advanced_PPTP_Content.html
 * http://pptpclient.sourceforge.net/howto-diagnosis.phtml
 * http://www.dd-wrt.com/wiki/index.php/Static_PPTP_VPN_Client
 * https://discussions.apple.com/thread/2778039?start=75&tstart=0
 * http://quozl.linux.org.au/pptp/pptpd.conf.5.html
 * http://www.linksysinfo.org/index.php?threads/tomato-with-pptp-and-snmp-support.26980/
Merge branch 'VLAN-MultiSSID' into Teaman-ND

* VLAN-MultiSSID:
  Minor multiLAN/wireless bugfixes
  fix dhcp options for non-VLAN builds
Merge remote-tracking branch 'origin/Teaman-PPTP' into Teaman-ND

* origin/Teaman-PPTP:
  PPTP Server for Tomato
  K24: fix kernel compilation error

Conflicts:
	release/src/Makefile
	release/src/router/config/config.in
	release/src/router/config_base
	release/src/router/httpd/Makefile
	release/src/router/httpd/tomato.c
	release/src/router/rc/firewall.c
	release/src/router/rc/rc.h
	release/src/router/www/Makefile
	release/src/router/www/about.asp
Merge branch 'Teaman-ND' into Teaman-ND-SDHC

* Teaman-ND:
  PPTP Server for Tomato
  Minor multiLAN/wireless bugfixes
  fix dhcp options for non-VLAN builds
  K24: fix kernel compilation error
K24: build 'en' tuneup to reduce size

 * trying to squeeze PPTPD and OpenVPN into SDHC-enabled builds
 * targeted at WRT54GL with MMC/SDHC mod (4M flash)
 * new option/switch at build time (leave out a few optional/unused tc queue modules)
 * related to commit 7fe19cfe85a55593a24abaf9b24ec45897a1b595
PPTPD: MPPE and compile bugfixes (batch #1)

* attempt to fix some random decryption errors causing connections to become unusable
* clients had to disconnect/reconnect manually to fix the problem once it started to happen
* the issue seems to be related with some parameters/settings being negociated between clients and the PPTP server
* hopefully, these changes should prevent these problems from happening
* see commit 3ef7e67858ecff04caf8197e381fa8b7c68c668e
* also, this commit should fix some build/compilation issues when merging this code into other branches
MultiSSID: fixes saving WL VIF settings when net mode is 'n-only' (5GHz radios)
PPTPD: move webUI pages into 'VPN Tunneling' menu
Merge branch 'VLAN-MultiSSID' into Teaman-ND

* VLAN-MultiSSID:
  MultiSSID: fixes saving WL VIF settings when net mode is 'n-only' (5GHz radios)
Merge branch 'Teaman-PPTP' into Teaman-ND

* Teaman-PPTP:
  PPTPD: move webUI pages into 'VPN Tunneling' menu
  PPTPD: MPPE and compile bugfixes (batch #1)

Conflicts:
	release/src/router/www/about.asp
Merge branch 'Teaman-ND' into Teaman-ND-SDHC

* Teaman-ND:
  PPTPD: move webUI pages into 'VPN Tunneling' menu
  MultiSSID: fixes saving WL VIF settings when net mode is 'n-only' (5GHz radios)
  PPTPD: MPPE and compile bugfixes (batch #1)
rc: syslogd custom path improvements

* preserve /var/log/messages if it's a file at syslogd restart
* if we have a custom path set, check if it's a symlink (and remove/recreate it if necessary
VLAN-GUI: include E4200v1 (VLAN 802.1q support confirmed by users)

* see http://code.google.com/p/tomato-sdhc-vlan/issues/detail?id=9
Merge branch 'VLAN-GUI' into VLAN-MultiSSID

* VLAN-GUI:
  VLAN-GUI: include E4200v1 (VLAN 802.1q support confirmed by users)
MultiSSID: check/warn about any BSSID/MAC address discrepancies on WLVIFS

* WL driver and OS must have the same values for BSSIDs and MAC addresses set on NVRAM (wlx.x_hwaddr)
* on most cases, wlconf will be able to generate/recreate wlX.Xhwaddr values on NVRAM just like the WL driver expects
* but under some circumstances, there might be some differences between what's on NVRAM and some HWaddress the WL driver will actually use
* since there's no easy way to figure out what exactly the WL will be doing (closed source/proprietary binary), we should warn the user about any mismatches found
IPTraffic: change NVRAM defaults to 'disabled'

* cstats_enable="0"