diff --git a/net.pl b/net.pl index cf39ee51..9ace24f1 100755 --- a/net.pl +++ b/net.pl @@ -31,7 +31,7 @@ my $scriptname = "$0 @ARGV"; my @allifaces = qw(em igc ix ixl); -my @allmodifymodes = qw(lro none nopf notso); +my @allmodifymodes = qw(nolro none nopf notso); my @allpseudos = qw(bridge none veb vlan); my @allsetupmodes = (qw(build install upgrade sysupgrade keep kernel reboot tools), "cvs,build", "cvs,kernel"); diff --git a/netlink.pl b/netlink.pl index e03ffbcd..fff6319b 100755 --- a/netlink.pl +++ b/netlink.pl @@ -28,7 +28,7 @@ use Netstat; my @allifaces = qw(em igc ix ixl); -my @allmodifymodes = qw(lro nopf notso); +my @allmodifymodes = qw(nolro nopf notso); my @allpseudos = qw(bridge none veb vlan); my @alltestmodes = sort qw(all fragment icmp tcp udp); @@ -626,29 +626,29 @@ sub lro_get_ifs { } my @lro_ifs; -sub lro_startup { +sub nolro_startup { my ($log) = @_; @lro_ifs = lro_get_ifs(); foreach my $ifname (@lro_ifs) { - my @cmd = ('/sbin/ifconfig', $ifname, 'tcplro'); + my @cmd = ('/sbin/ifconfig', $ifname, '-tcplro'); logcmd($log, @cmd) and die "Command '@cmd' failed: $?"; } # changing LRO may lose interface link status due to down/up sleep 1; - print $log "lro enabled\n\n"; - print "lro enabled\n\n" if $opts{v}; + print $log "lro disabled\n\n"; + print "lro disabled\n\n" if $opts{v}; } -sub lro_shutdown { +sub nolro_shutdown { my ($log) = @_; - print $log "\ndisabling lro\n"; - print "\ndisabling lro\n" if $opts{v}; + print $log "\nenabling lro\n"; + print "\nenabling lro\n" if $opts{v}; foreach my $ifname (@lro_ifs) { - my @cmd = ('/sbin/ifconfig', $ifname, '-tcplro'); + my @cmd = ('/sbin/ifconfig', $ifname, 'tcplro'); logcmd($log, @cmd) and die "Command '@cmd' failed: $?"; } @@ -894,9 +894,9 @@ sub notso_shutdown { }, ); -if ($modify && $modify eq 'lro') { - $tests[0]{startup} = \&lro_startup; - $tests[-1]{shutdown} = \&lro_shutdown; +if ($modify && $modify eq 'nolro') { + $tests[0]{startup} = \&nolro_startup; + $tests[-1]{shutdown} = \&nolro_shutdown; } if ($modify && $modify eq 'nopf') { $tests[0]{startup} = \&nopf_startup; diff --git a/once.pl b/once.pl index eee76539..c3580e7e 100755 --- a/once.pl +++ b/once.pl @@ -31,7 +31,7 @@ my $scriptname = "$0 @ARGV"; my @allkernelmodes = qw(align gap sort reorder reboot keep); -my @allmodifymodes = qw(lro nopf notso pfsync); +my @allmodifymodes = qw(nolro nopf notso pfsync); my @alltestmodes = qw( all net tcp udp make fs iperf tcpbench udpbench iperftcp iperfudp net4 tcp4 udp4 iperf4 tcpbench4 udpbench4 iperftcp4 iperfudp4 diff --git a/perform.pl b/perform.pl index 77ace306..c7d7dd82 100755 --- a/perform.pl +++ b/perform.pl @@ -26,7 +26,7 @@ my $startdir = getcwd(); my @startcmd = ($0, @ARGV); -my @allmodifymodes = qw(lro nopf notso pfsync); +my @allmodifymodes = qw(nolro nopf notso pfsync); my @alltestmodes = qw( all net tcp udp make fs iperf tcpbench udpbench iperftcp iperfudp net4 tcp4 udp4 iperf4 tcpbench4 udpbench4 iperftcp4 iperfudp4 @@ -495,18 +495,18 @@ sub lro_get_ifs { } my (@lro_ifs, @remote_lro_ifs); -sub lro_startup { +sub nolro_startup { my ($log) = @_; @lro_ifs = lro_get_ifs(); foreach my $ifname (@lro_ifs) { - my @cmd = ('/sbin/ifconfig', $ifname, 'tcplro'); + my @cmd = ('/sbin/ifconfig', $ifname, '-tcplro'); logcmd($log, @cmd) and die "Command '@cmd' failed: $?"; } @remote_lro_ifs = lro_get_ifs('ssh', $remote_ssh); foreach my $ifname (@remote_lro_ifs) { - my @cmd = ('/sbin/ifconfig', $ifname, 'tcplro'); + my @cmd = ('/sbin/ifconfig', $ifname, '-tcplro'); my @sshcmd = ('ssh', $remote_ssh, @cmd); logcmd($log, @sshcmd) and die "Command '@sshcmd' failed: $?"; @@ -514,22 +514,22 @@ sub lro_startup { # changing LRO may lose interface link status due to down/up sleep 1; - print $log "lro enabled\n\n"; - print "lro enabled\n\n" if $opts{v}; + print $log "lro disabled\n\n"; + print "lro disabled\n\n" if $opts{v}; } -sub lro_shutdown { +sub nolro_shutdown { my ($log) = @_; - print $log "\ndisabling lro\n"; - print "\ndisabling lro\n" if $opts{v}; + print $log "\nenabling lro\n"; + print "\nenabling lro\n" if $opts{v}; foreach my $ifname (@lro_ifs) { - my @cmd = ('/sbin/ifconfig', $ifname, '-tcplro'); + my @cmd = ('/sbin/ifconfig', $ifname, 'tcplro'); logcmd($log, @cmd) and die "Command '@cmd' failed: $?"; } foreach my $ifname (@remote_lro_ifs) { - my @cmd = ('/sbin/ifconfig', $ifname, '-tcplro'); + my @cmd = ('/sbin/ifconfig', $ifname, 'tcplro'); my @sshcmd = ('ssh', $remote_ssh, @cmd); logcmd($log, @sshcmd) and die "Command '@sshcmd' failed: $?"; @@ -1130,8 +1130,8 @@ sub fsmark_finalize { } ) if $testmode{vport6} && $linux_veb_addr6; if ($modify && $modify eq 'lro') { - $tests[0]{startup} = \&lro_startup; - $tests[-1]{shutdown} = \&lro_shutdown; + $tests[0]{startup} = \&nolro_startup; + $tests[-1]{shutdown} = \&nolro_shutdown; } if ($modify && $modify eq 'nopf') { $tests[0]{startup} = \&nopf_startup;