From e510abef1a0ed87e7c2159f77e7105d118219d51 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 13 Apr 2011 09:05:13 -0700 Subject: Fix irq naming convention mapping code The mislabeled commit ddce08161907797fe914ba609b362d812e23fc8a Fix wrong name in get_irq_affinity Was some code to handle Broadcom device IRQ naming convention that was untested. The part that built regex was incorrectly expanding a string with regex characters. --- scripts/system/irq-affinity.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/system/irq-affinity.pl b/scripts/system/irq-affinity.pl index 34465b1e..30df39fe 100755 --- a/scripts/system/irq-affinity.pl +++ b/scripts/system/irq-affinity.pl @@ -296,8 +296,9 @@ sub affinity_auto { # vmxnet3: eth0-rxtx-1 # bnx2x: eth0-fp-1 # other: eth0-1 - foreach my $sep (qw/-TxRx- -rxtx- -fp- -/) { - my $regex = "/^$ifname$sep\d$/"; + my @seperator = qw/- -TxRx- -rxtx- -fp-/; + foreach my $sep (@seperator) { + my $regex = '/^' . $ifname . $sep . '\d$/'; my $nq = grep { $regex } @irqnames; if ( $nq > 0 ) { return assign_multiqueue( $ifname, $nq, $irqmap, -- cgit v1.2.3