Merge branch 'VLAN-MultiSSID' into Teaman-ND
commiteb89cce375f0f393fb17eb25dc02f7824921fd97
authorAugusto Bott <augusto@bott.com.br>
Fri, 30 Mar 2012 09:54:02 +0000 (30 06:54 -0300)
committerAugusto Bott <augusto@bott.com.br>
Fri, 30 Mar 2012 09:54:02 +0000 (30 06:54 -0300)
treedcc2c6b947b03a8af1b611e867d65305b189f259
parent07df01fda87a1e7d90f8c8d842d42f700b534c4c
parentc83af12c4a9bb830863027342bd60208d1a62f9a
Merge branch 'VLAN-MultiSSID' into Teaman-ND

* VLAN-MultiSSID:
  MultiSSID: check/warn about any BSSID/MAC address discrepancies on WLVIFS
  VLAN-GUI: include E4200v1 (VLAN 802.1q support confirmed by users)
release/src/router/httpd/wl.c
release/src/router/www/advanced-vlan.asp