]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge tag 'ixp4xx-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Nov 2012 18:28:09 +0000 (10:28 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Nov 2012 18:28:09 +0000 (10:28 -0800)
Pull ARM ixp4xx bug fixes from Arnd Bergmann:
 "These were originally prepared by Krzysztof Halasa but not submitted
  in time for v3.7 due to some confusion about how ixp4xx patches should
  be handled.  Jason Cooper thankfully offered to help out sending the
  patches upstream through arm-soc now, but given the timing, we could
  as well delay them for 3.8."

* tag 'ixp4xx-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  IXP4xx: use __iomem for MMIO
  IXP4xx: map CPU config registers within VMALLOC region.
  IXP4xx: Always ioremap() Queue Manager MMIO region at boot.
  ixp4xx: Declare MODULE_FIRMWARE usage
  IXP4xx crypto: MOD_AES{128,192,256} already include key size.
  WAN: Remove redundant HDLC info printed by IXP4xx HSS driver.
  IXP4xx: Remove time limit for PCI TRDY to enable use of slow devices.
  IXP4xx: ixp4xx_crypto driver requires Queue Manager and NPE drivers.
  IXP4xx: HW pseudo-random generator is available on IXP45x/46x only.
  IXP4xx: Fix off-by-one bug in Goramo MultiLink platform.
  IXP4xx: Fix Goramo MultiLink platform compilation.

1  2 
drivers/net/wan/ixp4xx_hss.c

index e9a3da588e954b1ae38b8becf465b132dbbcd22f,0fe36d770e1fb44be3fc0a7cf44edd821edc73ce..760776b3d66c0033cae82c73c18fcad8fd7b57d5
@@@ -969,12 -969,10 +969,12 @@@ static int init_hdlc_queues(struct por
  {
        int i;
  
 -      if (!ports_open)
 -              if (!(dma_pool = dma_pool_create(DRV_NAME, NULL,
 -                                               POOL_ALLOC_SIZE, 32, 0)))
 +      if (!ports_open) {
 +              dma_pool = dma_pool_create(DRV_NAME, &port->netdev->dev,
 +                                         POOL_ALLOC_SIZE, 32, 0);
 +              if (!dma_pool)
                        return -ENOMEM;
 +      }
  
        if (!(port->desc_tab = dma_pool_alloc(dma_pool, GFP_KERNEL,
                                              &port->desc_tab_phys)))
@@@ -1365,7 -1363,7 +1365,7 @@@ static int __devinit hss_init_one(struc
  
        platform_set_drvdata(pdev, port);
  
-       netdev_info(dev, "HSS-%i\n", port->id);
+       netdev_info(dev, "initialized\n");
        return 0;
  
  err_free_netdev: