[Linux1394-cvslog] rev 807 - branches/linux-2.4
Brought to you by:
aeb,
bencollins
From: SVN U. <ben...@li...> - 2003-02-28 18:18:13
|
Author: bencollins Date: 2003-02-28 13:17:32 -0500 (Fri, 28 Feb 2003) New Revision: 807 Modified: branches/linux-2.4/eth1394.c Log: Workaround ARM's broken memcpy (which doesn't return void*). Patch from Bernard Leach. Modified: branches/linux-2.4/eth1394.c ============================================================================== --- branches/linux-2.4/eth1394.c (original) +++ branches/linux-2.4/eth1394.c 2003-02-28 13:17:33.000000000 -0500 @@ -206,7 +206,7 @@ unsigned char arp_data[2*(dev->addr_len+4)]; /* Copy the main data that we need */ - arp_ptr = memcpy (arp_data, arp_ptr + sizeof(struct arphdr), sizeof (arp_data)); + memcpy (arp_data, arp_ptr + sizeof(struct arphdr), sizeof (arp_data)); /* Extend the buffer enough for our new header */ skb_put (skb, sizeof (struct eth1394_arp) - @@ -214,7 +214,7 @@ #define PROCESS_MEMBER(ptr,val,len) \ memcpy (val, ptr, len); ptr += len - arp_ptr += arp1394->hw_addr_len; + arp_ptr = arp_data + arp1394->hw_addr_len; PROCESS_MEMBER (arp_ptr, &arp1394->sip, arp1394->ip_addr_len); arp_ptr += arp1394->hw_addr_len; PROCESS_MEMBER (arp_ptr, &arp1394->tip, arp1394->ip_addr_len); @@ -498,7 +498,7 @@ spin_unlock_irqrestore (&priv->lock, flags); #define PROCESS_MEMBER(ptr,val,len) \ - ptr = memcpy (ptr, val, len) + len + memcpy (ptr, val, len); ptr += len PROCESS_MEMBER (arp_ptr, src_hw, dev->addr_len); PROCESS_MEMBER (arp_ptr, &arp1394.sip, 4); PROCESS_MEMBER (arp_ptr, dest_hw, dev->addr_len); |