~ubuntu-branches/ubuntu/raring/linux-lowlatency/raring

« back to all changes in this revision

Viewing changes to drivers/net/wan/ixp4xx_hss.c

  • Committer: Package Import Robot
  • Author(s): Andy Whitcroft, Andy Whitcroft, Ubuntu: 3.7.0-4.12, Ubuntu: 3.7.0-4.11, Ubuntu: 3.7.0-4.10
  • Date: 2012-11-28 17:52:14 UTC
  • Revision ID: package-import@ubuntu.com-20121128175214-btremk0zrunld1q7
Tags: 3.7.0-4.3
[ Andy Whitcroft ]

* rebase to Ubuntu-3.7.0-4.12

[ Ubuntu: 3.7.0-4.12 ]

* Revert "[Config] Use -j1 for headers_install"
* Revert "[Config] install-arch-headers needs a valid config"
  Strayed into the weeds in search of the root cause of the periodic
  build failure.
  Fixes powerpc FTBS introduced in -4.11.
* [Config] hmake -j1
  The kernel makefile appears to have parallel dependency
  problems for the install_headers target. This appears to be root
  cause for a periodic build failure on N-way machines.

[ Ubuntu: 3.7.0-4.11 ]

* [Config] Use -j1 for headers_install
  Also fixes a powerpc FTBS introduced by
  "[Config] install-arch-headers needs a valid config".

[ Ubuntu: 3.7.0-4.10 ]

* [Config] add rebuild-test support for autopkgtest
  - LP: #1081500
* [tests] move build tests out of the way
  - LP: #1081500
* [tests] add an autopkgtest rebuild test
  - LP: #1081500
* rebase to v3.7-rc7
* SAUCE: Remove emi62 files duplicated in linux-firmware
* SAUCE: Remove sb16 files duplicated in linux-firmware
* SAUCE: Remove whiteheat files duplicated in linux-firmware
* SAUCE: Remove yamaha files duplicated in linux-firmware
* SAUCE: Remove dsp56k files used only by m68k
* SAUCE: firmware: Remove last vestiges of dabusb
* SAUCE: Remove vicam files duplicated in linux-firmware
* [Config] install-arch-headers needs a valid config
* rebase to v3.7-rc7
  - LP: #1076840
  - LP: #1081466

Show diffs side-by-side

added added

removed removed

Lines of Context:
969
969
{
970
970
        int i;
971
971
 
972
 
        if (!ports_open)
973
 
                if (!(dma_pool = dma_pool_create(DRV_NAME, NULL,
974
 
                                                 POOL_ALLOC_SIZE, 32, 0)))
 
972
        if (!ports_open) {
 
973
                dma_pool = dma_pool_create(DRV_NAME, &port->netdev->dev,
 
974
                                           POOL_ALLOC_SIZE, 32, 0);
 
975
                if (!dma_pool)
975
976
                        return -ENOMEM;
 
977
        }
976
978
 
977
979
        if (!(port->desc_tab = dma_pool_alloc(dma_pool, GFP_KERNEL,
978
980
                                              &port->desc_tab_phys)))