From e8cc01d3a085b72ec4f57b0cbf6df497c002a338 Mon Sep 17 00:00:00 2001 From: Sreenivasa Honnur Date: Mon, 5 Oct 2009 01:53:38 +0000 Subject: [PATCH] --- yaml --- r: 170445 b: refs/heads/master c: 0f8f7d58eb4840ee8790e914a88b8a773aca9143 h: refs/heads/master i: 170443: 6cbb6a09cfee96f191fb800d034a7cc31926d238 v: v3 --- [refs] | 2 +- trunk/drivers/net/vxge/vxge-config.c | 2 -- trunk/drivers/net/vxge/vxge-reg.h | 4 ---- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 61d8db6628ba..f3f6006b873c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 657205bdd7b276d95b3a5bac7e856e22c4001136 +refs/heads/master: 0f8f7d58eb4840ee8790e914a88b8a773aca9143 diff --git a/trunk/drivers/net/vxge/vxge-config.c b/trunk/drivers/net/vxge/vxge-config.c index 11cdb381681a..e51fac8d0ad0 100644 --- a/trunk/drivers/net/vxge/vxge-config.c +++ b/trunk/drivers/net/vxge/vxge-config.c @@ -4106,8 +4106,6 @@ __vxge_hw_vpath_initialize(struct __vxge_hw_device *hldev, u32 vp_id) if (status != VXGE_HW_OK) goto exit; - writeq(0, &vp_reg->gendma_int); - val64 = readq(&vp_reg->rtdma_rd_optimization_ctrl); /* Get MRRS value from device control */ diff --git a/trunk/drivers/net/vxge/vxge-reg.h b/trunk/drivers/net/vxge/vxge-reg.h index 9a3b823e08d4..9a0cf8eaa328 100644 --- a/trunk/drivers/net/vxge/vxge-reg.h +++ b/trunk/drivers/net/vxge/vxge-reg.h @@ -4326,10 +4326,6 @@ struct vxge_hw_vpath_reg { /*0x011e0*/ u64 umq_bwr_init_byte; #define VXGE_HW_UMQ_BWR_INIT_BYTE_COUNT(val) vxge_vBIT(val, 0, 32) /*0x011e8*/ u64 gendma_int; -#define VXGE_HW_GENDMA_INT_IMMED_ENABLE vxge_mBIT(6) -#define VXGE_HW_GENDMA_INT_EVENT_ENABLE vxge_mBIT(7) -#define VXGE_HW_GENDMA_INT_NUMBER(val) vxge_vBIT(val, 9, 7) -#define VXGE_HW_GENDMA_INT_BITMAP(val) vxge_vBIT(val, 16, 16) /*0x011f0*/ u64 umqdmq_ir_init_notify; #define VXGE_HW_UMQDMQ_IR_INIT_NOTIFY_PULSE vxge_mBIT(3) /*0x011f8*/ u64 dmq_init_notify;