Handle Vmware mulitqueue naming convention

Adapt to irq naming convention in 2.6.37 kernel for vmxnet3 driver.

1 files changed, 9 insertions, 1 deletions

diff --git a/scripts/system/irq-affinity.pl b/scripts/system/irq-affinity.pl
index e334f4aa..99d37bbc 100755
--- a/scripts/system/irq-affinity.pl
+++ b/scripts/system/irq-affinity.pl
@@ -289,16 +289,24 @@ sub affinity_auto {
             my $ntx = grep { /$ifname-tx-/ } @irqnames;
             die "$ifname: rx queues $nq != tx queues $ntx"
               unless ( $nq == $ntx );
-	
+
             return assign_multiqueue( $ifname, $nq, $irqmap,
                 [ '%s-rx-%d', '%s-tx-%d' ] );
         }
 
+	# intel convention
         $nq = grep { /$ifname-TxRx-/ } @irqnames;
         if ( $nq > 0 ) {
             return assign_multiqueue( $ifname, $nq, $irqmap, ['%s-TxRx-%d'] );
         }
 
+	# vmxnet3 convention
+	$nq = grep { /$ifname-rxtx-/ } @irqnames;
+        if ( $nq > 0 ) {
+            return assign_multiqueue( $ifname, $nq, $irqmap, ['%s-rxtx-%d'] );
+        }
+
+	# old naming
         $nq = grep { /$ifname-\d$/ } @irqnames;
         if ( $nq > 0 ) {
             return assign_multiqueue( $ifname, $nq, $irqmap, ['%s-%d'] );