lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-18 18:44:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

interfaces: correctly unset VLAN acceleration; fixes #252

Browse Source
This commit is contained in:
Franco Fichtner 2015-07-30 11:12:30 +02:00
parent a62931b44a
commit 280a00d800
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/etc/inc/interfaces.inc
View File

@ -261,12 +261,11 @@ function interface_vlan_configure(&$vlan) {
return;
}
/* make sure the parent interface is up */
interfaces_bring_up($if);
if (!isset($config['system']['disablevlanhwfilter'])) {
/* Since we are going to add vlan(4) try to enable all that hardware supports. */
/* (but only when not disabled in system advanced network settings) */
legacy_interface_flags($if, 'vlanhwtag vlanmtu vlanhwfilter');
legacy_interface_flags($if, 'vlanmtu vlanhwtag vlanhwfilter vlanhwcsum vlanhwtso');
} else {
legacy_interface_flags($if, '-vlanmtu -vlanhwtag -vlanhwfilter -vlanhwcsum -vlanhwtso');
}
if (!empty($vlanif) && does_interface_exist($vlanif)) {
@ -3005,13 +3004,12 @@ function interface_configure($interface = 'wan', $reloadall = false, $linkupeven
/* skip vlans for checksumming and polling */
if (!stristr($realif, "_vlan") && is_array($options)) {
legacy_interface_flags($realhwif, sprintf(
'%stxcsum %srxcsum %stso %slro %spolling %svlanhwfilter',
'%stxcsum %srxcsum %stso %slro %spolling',
isset($config['system']['disablechecksumoffloading']) ? '-' : '',
isset($config['system']['disablechecksumoffloading']) ? '-' : '',
isset($config['system']['disablesegmentationoffloading']) ? '-' : '',
isset($config['system']['disablelargereceiveoffloading']) ? '-' : '',
isset($config['system']['polling']) ? '' : '-',
isset($config['system']['disablevlanhwfilter']) ? '-' : ''
isset($config['system']['polling']) ? '' : '-'
));
}