← Back to branch summary

~ubuntu-branches/debian/experimental/linux-2.6/experimental

« back to all changes in this revision

Viewing changes to drivers/net/ethernet/mellanox/mlx4/resource_tracker.c

  • Committer: Package Import Robot
  • Author(s): Ben Hutchings, Ben Hutchings
  • Date: 2012-03-21 03:08:36 UTC
  • mfrom: (1.2.34)
  • Revision ID: package-import@ubuntu.com-20120321030836-rvavg03lkz15wj2q
Tags: 3.3-1~experimental.1
http://bugs.debian.org/663041
* New upstream release: http://kernelnewbies.org/Linux_3.3

[ Ben Hutchings ]
* [x86] crypto: Enable CRYPTO_SERPENT_SSE2_586, CRYPTO_SERPENT_SSE2_X86_64
* aufs: Update to aufs3.x-rcN-20120312
* IB: Enable INFINIBAND_SRPT as module (Closes: #663041)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
2255
2255
 
2256
2256
        if (vhcr->op_modifier == 0) {
2257
2257
                err = handle_resize(dev, slave, vhcr, inbox, outbox, cmd, cq);
2258
 
                if (err)
2259
 
                        goto ex_put;
 
2258
                goto ex_put;
2260
2259
        }
2261
2260
 
2262
2261
        err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);