Fixed the row/double-row errors.

diff --git a/zyxel/zyxelcommon.py b/zyxel/zyxelcommon.py
index a12214033ba144233fce2824153fe2c185ddfff1..5609e5ceee84abfb52ff238a77a42fe3b4ad16e7 100644 (file)
--- a/zyxel/zyxelcommon.py
+++ b/zyxel/zyxelcommon.py
@@ -5,13 +5,14 @@ LOGHOST="194.0.255.20"
 # No Z-constant for you!
 def retSubnet(sw):
     (rad,num) = sw
-    if rad <= 7 or (rad == 8 and (sw <= 3 or sw == 6)):
+    drad = (rad - 1) / 2
+    if drad <= 7 or (drad == 8 and (sw <= 3 or sw == 6)):
         return "241"
-    if rad <= 13 or (rad == 14 and sw != 4) or (rad == 15 and sw <= 3):
+    if drad <= 13 or (drad == 14 and sw != 4) or (drad == 15 and sw <= 3):
         return "242"
-    if rad <= 22 or (rad == 23 and sw >= 4) or (rad == 24 and sw == 4):
+    if drad <= 22 or (drad == 23 and sw >= 4) or (drad == 24 and sw == 4):
         return "243"
-    if rad <= 29 or (rad == 30 and (sw == 4 or sw == 5)):
+    if drad <= 29 or (drad == 30 and (sw == 4 or sw == 5)):
         return "244"
     return "245"