From c15a3db702834bfcf2240f9dd6567b16f4050ddf Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 23 Dec 2010 20:15:39 +0000 Subject: [PATCH] --- yaml --- r: 225403 b: refs/heads/master c: a7dd6027e55992dd7c409a71a4a2b576fda2f7c2 h: refs/heads/master i: 225401: db768eb0173da7dcaa78d4510c42ad78eaa96b27 225399: 9b47a50b7ce24cb2c6f93d8be77411db57ed9a4b v: v3 --- [refs] | 2 +- trunk/drivers/net/vxge/vxge-traffic.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c27ab00f48aa..16166232f899 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17f7f4d9fcce8f1b75b5f735569309dee7665968 +refs/heads/master: a7dd6027e55992dd7c409a71a4a2b576fda2f7c2 diff --git a/trunk/drivers/net/vxge/vxge-traffic.c b/trunk/drivers/net/vxge/vxge-traffic.c index 42cc29843ac7..4c10d6c4075f 100644 --- a/trunk/drivers/net/vxge/vxge-traffic.c +++ b/trunk/drivers/net/vxge/vxge-traffic.c @@ -1240,7 +1240,7 @@ enum vxge_hw_status vxge_hw_ring_rxd_next_completed( *t_code = (u8)VXGE_HW_RING_RXD_T_CODE_GET(control_0); /* check whether it is not the end */ - if (!own || ((*t_code == VXGE_HW_RING_T_CODE_FRM_DROP) && own)) { + if (!own || *t_code == VXGE_HW_RING_T_CODE_FRM_DROP) { vxge_assert(((struct vxge_hw_ring_rxd_1 *)rxdp)->host_control != 0);