From: Ali Saidi <saidi@eecs.umich.edu>
Date: Sat, 27 Nov 2010 01:47:23 +0000 (-0500)
Subject: IGbE: return 0 on an invalid descriptor size instead of -1.
X-Git-Tag: stable_2012_02_02~716
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0f039fe447c9b1a6e885d8e5e794c25c10da39b9;p=gem5.git

IGbE: return 0 on an invalid descriptor size instead of -1.

Asserts where descSize() get called with assert if we end up returning
0.
---

diff --git a/src/dev/i8254xGBe_defs.hh b/src/dev/i8254xGBe_defs.hh
index 4de347b99..c37a6dc0e 100644
--- a/src/dev/i8254xGBe_defs.hh
+++ b/src/dev/i8254xGBe_defs.hh
@@ -484,12 +484,12 @@ struct Regs {
         unsigned descSize()
         {
             switch(bsize()) {
-                case 0: return bsex() == 0 ? 2048 : -1;
+                case 0: return bsex() == 0 ? 2048 : 0;
                 case 1: return bsex() == 0 ? 1024 : 16384;
                 case 2: return bsex() == 0 ? 512 : 8192;
                 case 3: return bsex() == 0 ? 256 : 4096;
                 default:
-                        return -1;
+                        return 0;
             }
         }
     };