From 2fede9cba7cc801b1df0632b3552337f1da140de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carl-Benedikt=20Kr=FCger?= Date: Thu, 16 Jun 2011 14:51:43 +0200 Subject: [PATCH] removed code errors --- drivers/net/mmnif.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/mmnif.c b/drivers/net/mmnif.c index 0e3d8bac..eaddd2d2 100644 --- a/drivers/net/mmnif.c +++ b/drivers/net/mmnif.c @@ -341,7 +341,7 @@ __inline int mmnif_write_rx_buffl(uint32_t dest_ip, uint32_t pos,void* data,uint #else // uint16_t length = *((uint16_t*)data); memcpy((char*)mpb_start_address +(dest_ip -1 ) * mpb_size + sizeof(mm_rx_buffer_t)+ pos * MMNIF_RX_BUFFERLEN,&length,2); - memcpy(char*)mpb_start_address +(dest_ip -1 ) * mpb_size + sizeof(mm_rx_buffer_t)+ pos * MMNIF_RX_BUFFERLEN + 2,data,length); + memcpy((char*)mpb_start_address +(dest_ip -1 ) * mpb_size + sizeof(mm_rx_buffer_t)+ pos * MMNIF_RX_BUFFERLEN + 2,data,length); return 1; #endif }; @@ -380,7 +380,7 @@ __inline int mmnif_write_rx_pending(uint32_t dest_ip,uint8_t pending) return nr_of_bytes_written; #else - memcpy((char*)mpb_start_address + ( dest_ip -1 ) * mpb_size ,&queue,1); + memcpy((char*)mpb_start_address + ( dest_ip -1 ) * mpb_size ,&pending,1); return 1; #endif @@ -408,7 +408,7 @@ __inline int mmnif_trigger_irq(dest_ip) /**/ value = inportl((void*)irq_address); - if (!pulse_irq) && (value & RCK_INTR_MASK)) + if ((!pulse_irq) && (value & RCK_INTR_MASK)) { value &= (~(RCK_INTR_MASK|RCK_NMI_MASK)); outportl((void*)irq_address,value); @@ -420,7 +420,7 @@ __inline int mmnif_trigger_irq(dest_ip) /**/ if (pulse_irq) { - value &= (~(RCK_INTR_MASK|NMI_MASK)); + value &= (~(RCK_INTR_MASK|RCK_NMI_MASK)); outportl((void*)irq_address,value); }