diff options
| author | jim-p <jimp@pfsense.org> | 2016-02-15 12:16:38 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2016-02-15 12:16:38 -0500 |
| commit | bc4d752b1aba4492d5f397cf0ed97926be6f5f3c (patch) | |
| tree | a9ee3dd9e8ead5d9c3e2b0294e5335332f2e3c91 /src | |
| parent | 6f4f88da396f6c452e5cc106524d51b89547bc30 (diff) | |
| download | pfsense-bc4d752b1aba4492d5f397cf0ed97926be6f5f3c.zip pfsense-bc4d752b1aba4492d5f397cf0ed97926be6f5f3c.tar.gz | |
This seems to have negatively impacted LAGG/VLAN configs. Revert "Only set IFCAPS where they're not already set correctly. Ticket #5887"
This reverts commit 7f283fab1b18bb575537bb8498b16a6b1b6d0251.
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/inc/pfsense-utils.inc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc index 1abd642..baf163a 100644 --- a/src/etc/inc/pfsense-utils.inc +++ b/src/etc/inc/pfsense-utils.inc @@ -177,10 +177,10 @@ function hardware_offloading_applyflags($iface) { $flags_off |= IFCAP_RXCSUM; } } else { - if (isset($options['caps']['txcsum']) && !isset($options['encaps']['txcsum'])) { + if (isset($options['caps']['txcsum'])) { $flags_on |= IFCAP_TXCSUM; } - if (isset($options['caps']['rxcsum']) && !isset($options['encaps']['rxcsum'])) { + if (isset($options['caps']['rxcsum'])) { $flags_on |= IFCAP_RXCSUM; } } @@ -188,21 +188,19 @@ function hardware_offloading_applyflags($iface) { if (isset($config['system']['disablesegmentationoffloading'])) { $flags_off |= IFCAP_TSO; } else if (isset($options['caps']['tso']) || isset($options['caps']['tso4']) || isset($options['caps']['tso6'])) { - if (!isset($options['encaps']['tso']) || !isset($options['encaps']['tso4']) || !isset($options['encaps']['tso6'])) { - $flags_on |= IFCAP_TSO; - } + $flags_on |= IFCAP_TSO; } - if (isset($config['system']['disablelargereceiveoffloading']) && isset($options['encaps']['lro'])) { + if (isset($config['system']['disablelargereceiveoffloading'])) { $flags_off |= IFCAP_LRO; - } else if (isset($options['caps']['lro']) && !isset($options['encaps']['lro'])) { + } else if (isset($options['caps']['lro'])) { $flags_on |= IFCAP_LRO; } /* if the NIC supports polling *AND* it is enabled in the GUI */ - if (!isset($config['system']['polling']) && isset($options['encaps']['polling'])) { + if (!isset($config['system']['polling'])) { $flags_off |= IFCAP_POLLING; - } else if (isset($options['caps']['polling']) && !isset($options['encaps']['polling'])) { + } else if (isset($options['caps']['polling'])) { $flags_on |= IFCAP_POLLING; } |
