diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-14 13:32:43 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-14 13:32:43 -0700 | 
| commit | dd286422fefdcff784e8d336deeb88ce817e14db (patch) | |
| tree | 3d3c13ebab12e7e5768c062a31b3a6c7aa72f004 /drivers/infiniband/hw/nes/nes.c | |
| parent | 4717df58304b60ac26cdb157d57f39ae1e3a336f (diff) | |
| parent | a58e58fafdff4c25949221e46132e86f709d0b79 (diff) | |
| download | olio-linux-3.10-dd286422fefdcff784e8d336deeb88ce817e14db.tar.xz olio-linux-3.10-dd286422fefdcff784e8d336deeb88ce817e14db.zip  | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  RDMA/cxgb3: Wrap the software send queue pointer as needed on flush
  IB/ipath: Change ipath_devdata.ipath_sdma_status to be unsigned long
  IB/ipath: Make ipath_portdata work with struct pid * not pid_t
  IB/ipath: Fix RDMA read response sequence checking
  IB/ipath: Fix many locking issues when switching to error state
  IB/ipath: Fix RC and UC error handling
  RDMA/nes: Fix up nes_lro_max_aggr module parameter
Diffstat (limited to 'drivers/infiniband/hw/nes/nes.c')
| -rw-r--r-- | drivers/infiniband/hw/nes/nes.c | 4 | 
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c index 9f7364a9096..a4e9269a29b 100644 --- a/drivers/infiniband/hw/nes/nes.c +++ b/drivers/infiniband/hw/nes/nes.c @@ -91,10 +91,6 @@ unsigned int nes_debug_level = 0;  module_param_named(debug_level, nes_debug_level, uint, 0644);  MODULE_PARM_DESC(debug_level, "Enable debug output level"); -unsigned int nes_lro_max_aggr = NES_LRO_MAX_AGGR; -module_param(nes_lro_max_aggr, int, NES_LRO_MAX_AGGR); -MODULE_PARM_DESC(nes_mro_max_aggr, " nic LRO MAX packet aggregation"); -  LIST_HEAD(nes_adapter_list);  static LIST_HEAD(nes_dev_list);  |