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.h | |
| parent | 4717df58304b60ac26cdb157d57f39ae1e3a336f (diff) | |
| parent | a58e58fafdff4c25949221e46132e86f709d0b79 (diff) | |
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.h')
| -rw-r--r-- | drivers/infiniband/hw/nes/nes.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h index 1f9f7bf73862..61b46e9c7d2d 100644 --- a/drivers/infiniband/hw/nes/nes.h +++ b/drivers/infiniband/hw/nes/nes.h @@ -173,7 +173,6 @@ extern int disable_mpa_crc; extern unsigned int send_first; extern unsigned int nes_drv_opt; extern unsigned int nes_debug_level; -extern unsigned int nes_lro_max_aggr; extern struct list_head nes_adapter_list; |