From: Paul Durrant <paul.durrant@citrix.com>
Date: Tue, 3 Feb 2015 10:20:55 +0000 (+0000)
Subject: A single queue to the backend should imply and index of 0
X-Git-Tag: 8.1.0-rc1~60
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=10c212164a9421bfdeec2bd164ba82b3ff1fc897;p=people%2Fpauldu%2Fxenvif.git

A single queue to the backend should imply and index of 0

There is no need to test for both so change the extra test into an
assertion.

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
---

diff --git a/src/xenvif/receiver.c b/src/xenvif/receiver.c
index a53a03f..e64c942 100644
--- a/src/xenvif/receiver.c
+++ b/src/xenvif/receiver.c
@@ -2297,7 +2297,8 @@ __ReceiverRingStoreWrite(
     Receiver = Ring->Receiver;
     Frontend = Receiver->Frontend;
 
-    Path = (FrontendGetQueueCount(Frontend) == 1 && Ring->Index == 0) ?
+    ASSERT(IMPLY(FrontendGetQueueCount(Frontend) == 1, Ring->Index == 0));
+    Path = (FrontendGetQueueCount(Frontend) == 1) ?
                     FrontendGetPath(Frontend) :
                     Ring->Path;
 
diff --git a/src/xenvif/transmitter.c b/src/xenvif/transmitter.c
index aa55f1c..bdf1b44 100644
--- a/src/xenvif/transmitter.c
+++ b/src/xenvif/transmitter.c
@@ -3133,7 +3133,8 @@ __TransmitterRingStoreWrite(
     Transmitter = Ring->Transmitter;
     Frontend = Transmitter->Frontend;
 
-    Path = (FrontendGetQueueCount(Frontend) == 1 && Ring->Index == 0) ?
+    ASSERT(IMPLY(FrontendGetQueueCount(Frontend) == 1, Ring->Index == 0));
+    Path = (FrontendGetQueueCount(Frontend) == 1) ?
                     FrontendGetPath(Frontend) :
                     Ring->Path;