From f39de79cebe86930d1b5b6d8d195c4f77e8db12a Mon Sep 17 00:00:00 2001 From: sbwml Date: Wed, 4 Sep 2024 05:51:33 +0800 Subject: [PATCH] natflow: remove log printing Signed-off-by: sbwml --- files/21-natflow.hotplug | 1 - files/natflow.init | 23 ++++++----------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/files/21-natflow.hotplug b/files/21-natflow.hotplug index 96863f2..63d4e56 100644 --- a/files/21-natflow.hotplug +++ b/files/21-natflow.hotplug @@ -3,5 +3,4 @@ [ "$ACTION" = ifup -o "$ACTION" = ifupdate ] || exit 0 [ "$ACTION" = ifupdate -a -z "$IFUPDATE_ADDRESSES" -a -z "$IFUPDATE_DATA" ] && exit 0 -logger -t natflow "reloading natflow due to $ACTION of $INTERFACE ($DEVICE)" /etc/init.d/natflow restart & diff --git a/files/natflow.init b/files/natflow.init index c778253..1be3498 100644 --- a/files/natflow.init +++ b/files/natflow.init @@ -5,27 +5,15 @@ START=95 disable_gro_gso() { for eth in $(ifconfig | grep "^eth\|^dsa|^lan|^wan" | awk '{print $1}' | sort | uniq); do - ethtool -k "$eth" | grep -q "generic-receive-offload: off" || { - ethtool -K "$eth" gro off - logger -t natflow "disable gro for <$eth>" - } - ethtool -k "$eth" | grep -q "generic-segmentation-offload: off" || { - ethtool -K "$eth" gso off - logger -t natflow "disable gso for <$eth>" - } + ethtool -k "$eth" | grep -q "generic-receive-offload: off" || ethtool -K "$eth" gro off + ethtool -k "$eth" | grep -q "generic-segmentation-offload: off" || ethtool -K "$eth" gso off done } enable_gro_gso() { for eth in $(ifconfig | grep "^eth\|^dsa|^lan|^wan" | awk '{print $1}' | sort | uniq); do - ethtool -k "$eth" | grep -q "generic-receive-offload: on" || { - ethtool -K "$eth" gro on - logger -t natflow "enable gro for <$eth>" - } - ethtool -k "$eth" | grep -q "generic-segmentation-offload: on" || { - ethtool -K "$eth" gso on - logger -t natflow "enable gro for <$eth>" - } + [[ "$(uname -m)" != arm* ]] && ethtool -k "$eth" | grep -q "generic-receive-offload: on" || ethtool -K "$eth" gro on + ethtool -k "$eth" | grep -q "generic-segmentation-offload: on" || ethtool -K "$eth" gso on done } @@ -37,16 +25,17 @@ start() { echo disabled=0 >/dev/natflow_ctl echo "delay_pkts=$delay_pkts" >/dev/natflow_ctl echo ifname_clear >/dev/natflow_ctl + logger -t natflow "natflow has been enabled" } stop() { test -c /dev/natflow_ctl || return 0 enable_gro_gso echo disabled=1 >/dev/natflow_ctl + logger -t natflow "natflow has been disabled" } restart() { stop - sleep 1 start }