IGbE: return 0 on an invalid descriptor size instead of -1.
authorAli Saidi <saidi@eecs.umich.edu>
Sat, 27 Nov 2010 01:47:23 +0000 (20:47 -0500)
committerAli Saidi <saidi@eecs.umich.edu>
Sat, 27 Nov 2010 01:47:23 +0000 (20:47 -0500)
Asserts where descSize() get called with assert if we end up returning
0.

src/dev/i8254xGBe_defs.hh

index 4de347b99ba6f120365a512c4c6417e239e981bf..c37a6dc0eb5cdd78fc1408ed92abba70f10106c7 100644 (file)
@@ -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;
             }
         }
     };