Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[linux-2.6] / drivers / net / niu.c

diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index 43bfe7e6b6f5c0c167885460c2a55871066b10ea..112ab079ce7d19af82403d8e148701470ddc2c17 100644 (file)
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -3103,31 +3103,12 @@ static int niu_alloc_tx_ring_info(struct niu *np,
 
 static void niu_size_rbr(struct niu *np, struct rx_ring_info *rp)
 {
-       u16 bs;
+       u16 bss;
 
-       switch (PAGE_SIZE) {
-       case 4 * 1024:
-       case 8 * 1024:
-       case 16 * 1024:
-       case 32 * 1024:
-               rp->rbr_block_size = PAGE_SIZE;
-               rp->rbr_blocks_per_page = 1;
-               break;
+       bss = min(PAGE_SHIFT, 15);
 
-       default:
-               if (PAGE_SIZE % (32 * 1024) == 0)
-                       bs = 32 * 1024;
-               else if (PAGE_SIZE % (16 * 1024) == 0)
-                       bs = 16 * 1024;
-               else if (PAGE_SIZE % (8 * 1024) == 0)
-                       bs = 8 * 1024;
-               else if (PAGE_SIZE % (4 * 1024) == 0)
-                       bs = 4 * 1024;
-               else
-                       BUG();
-               rp->rbr_block_size = bs;
-               rp->rbr_blocks_per_page = PAGE_SIZE / bs;
-       }
+       rp->rbr_block_size = 1 << bss;
+       rp->rbr_blocks_per_page = 1 << (PAGE_SHIFT-bss);
 
        rp->rbr_sizes[0] = 256;
        rp->rbr_sizes[1] = 1024;
@@ -6123,19 +6104,19 @@ static int __devinit niu_pci_probe_sprom(struct niu *np)
        val = nr64(ESPC_PHY_TYPE);
        switch (np->port) {
        case 0:
-               val = (val & ESPC_PHY_TYPE_PORT0) >>
+               val8 = (val & ESPC_PHY_TYPE_PORT0) >>
                        ESPC_PHY_TYPE_PORT0_SHIFT;
                break;
        case 1:
-               val = (val & ESPC_PHY_TYPE_PORT1) >>
+               val8 = (val & ESPC_PHY_TYPE_PORT1) >>
                        ESPC_PHY_TYPE_PORT1_SHIFT;
                break;
        case 2:
-               val = (val & ESPC_PHY_TYPE_PORT2) >>
+               val8 = (val & ESPC_PHY_TYPE_PORT2) >>
                        ESPC_PHY_TYPE_PORT2_SHIFT;
                break;
        case 3:
-               val = (val & ESPC_PHY_TYPE_PORT3) >>
+               val8 = (val & ESPC_PHY_TYPE_PORT3) >>
                        ESPC_PHY_TYPE_PORT3_SHIFT;
                break;
        default:
@@ -6143,9 +6124,9 @@ static int __devinit niu_pci_probe_sprom(struct niu *np)
                        np->port);
                return -EINVAL;
        }
-       niudbg(PROBE, "SPROM: PHY type %llx\n", (unsigned long long) val);
+       niudbg(PROBE, "SPROM: PHY type %x\n", val8);
 
-       switch (val) {
+       switch (val8) {
        case ESPC_PHY_TYPE_1G_COPPER:
                /* 1G copper, MII */
                np->flags &= ~(NIU_FLAGS_FIBER |
@@ -6175,8 +6156,7 @@ static int __devinit niu_pci_probe_sprom(struct niu *np)
                break;
 
        default:
-               dev_err(np->device, PFX "Bogus SPROM phy type %llu\n",
-                       (unsigned long long) val);
+               dev_err(np->device, PFX "Bogus SPROM phy type %u\n", val8);
                return -EINVAL;
        }
 
@@ -6213,7 +6193,7 @@ static int __devinit niu_pci_probe_sprom(struct niu *np)
        val = nr64(ESPC_MOD_STR_LEN);
        niudbg(PROBE, "SPROM: MOD_STR_LEN[%llu]\n",
               (unsigned long long) val);
-       if (val > 8 * 4)
+       if (val >= 8 * 4)
                return -EINVAL;
 
        for (i = 0; i < val; i += 4) {
@@ -6229,7 +6209,7 @@ static int __devinit niu_pci_probe_sprom(struct niu *np)
        val = nr64(ESPC_BD_MOD_STR_LEN);
        niudbg(PROBE, "SPROM: BD_MOD_STR_LEN[%llu]\n",
               (unsigned long long) val);
-       if (val > 4 * 4)
+       if (val >= 4 * 4)
                return -EINVAL;
 
        for (i = 0; i < val; i += 4) {
@@ -7903,12 +7883,7 @@ static int __init niu_init(void)
 {
        int err = 0;
 
-       BUILD_BUG_ON((PAGE_SIZE < 4 * 1024) ||
-                    ((PAGE_SIZE > 32 * 1024) &&
-                     ((PAGE_SIZE % (32 * 1024)) != 0 &&
-                      (PAGE_SIZE % (16 * 1024)) != 0 &&
-                      (PAGE_SIZE % (8 * 1024)) != 0 &&
-                      (PAGE_SIZE % (4 * 1024)) != 0)));
+       BUILD_BUG_ON(PAGE_SIZE < 4 * 1024);
 
        niu_debug = netif_msg_init(debug, NIU_MSG_DEFAULT);