diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2011-04-13 09:05:13 -0700 |
|---|---|---|
| committer | Stephen Hemminger <shemminger@vyatta.com> | 2011-04-13 09:05:13 -0700 |
| commit | e510abef1a0ed87e7c2159f77e7105d118219d51 (patch) | |
| tree | b6f4e10a4b4126b2f26f15d09bf2175508553a74 | |
| parent | 46c80e873091c244fca2135e46df8e74f8d62b3b (diff) | |
| download | vyatta-cfg-quagga-e510abef1a0ed87e7c2159f77e7105d118219d51.tar.gz vyatta-cfg-quagga-e510abef1a0ed87e7c2159f77e7105d118219d51.zip | |
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.
| -rwxr-xr-x | scripts/system/irq-affinity.pl | 5 |
1 files changed, 3 insertions, 2 deletions
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, |