| commit | f210b4f400d036cd976cc62cc8fc6b81b3170902 | |
| author | Augusto Bott <augusto@bott.com.br> | |
| Fri, 4 Nov 2011 08:54:52 +0000 (4 06:54 -0200) | ||
| committer | Augusto Bott <augusto@bott.com.br> | |
| Fri, 4 Nov 2011 08:54:52 +0000 (4 06:54 -0200) | ||
| tree | 2d5adf55f3895263491b1b278ac54e4f138ab762 | tree |
| parent | ffa7bf44ffd1875cc75a9dfd7d6f91f8b42f5427 | commitdiff |
| parent | e9667e4bded80bcae6af7a1e38c2cc2e7dd76b57 | commitdiff |
Merge branch 'VLAN-GUI' into VLAN-MultiSSID
* VLAN-GUI:
SSID broadcast on status-overview.asp
Hostname completeness (status-devices.asp)
Status/Device List: don't assume any/all active DHCP leases are on/from br0
LAN access: new/revised iptables ruleset
Option to include (or not) VLAN-GUI
Increased netmask size/limit for LAN subnets
Conflicts:
release/src/router/rc/wnas.c
release/src/router/www/basic-network.asp
release/src/router/www/status-overview.asp
* VLAN-GUI:
SSID broadcast on status-overview.asp
Hostname completeness (status-devices.asp)
Status/Device List: don't assume any/all active DHCP leases are on/from br0
LAN access: new/revised iptables ruleset
Option to include (or not) VLAN-GUI
Increased netmask size/limit for LAN subnets
Conflicts:
release/src/router/rc/wnas.c
release/src/router/www/basic-network.asp
release/src/router/www/status-overview.asp