X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fdnet.c;h=944a0c046f7a9214b0e405cf91465029d7fbe353;hb=d0b961684eb5757211e9463f5f24c3175e453798;hp=bfe87faa2f9fd34ed81917352335509f9f53579f;hpb=09fee8e8677a6265e89144ccc163bf00e321769e;p=oweals%2Fu-boot.git diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c index bfe87faa2f..944a0c046f 100644 --- a/drivers/net/dnet.c +++ b/drivers/net/dnet.c @@ -20,6 +20,7 @@ #include #include +#include #include "dnet.h" @@ -129,19 +130,15 @@ static u16 dnet_mdio_read(struct dnet_device *dnet, u8 reg) return value; } -static int dnet_send(struct eth_device *netdev, volatile void *packet, - int length) +static int dnet_send(struct eth_device *netdev, void *packet, int length) { struct dnet_device *dnet = to_dnet(netdev); - int i, len, wrsz; + int i, wrsz; unsigned int *bufp; unsigned int tx_cmd; debug(DRIVERNAME "[%s] Sending %u bytes\n", __func__, length); - /* frame size (words) */ - len = (length + 3) >> 2; - bufp = (unsigned int *) (((u32)packet) & 0xFFFFFFFC); wrsz = (u32)length + 3; wrsz += ((u32)packet) & 0x3; @@ -206,11 +203,11 @@ static void dnet_set_hwaddr(struct eth_device *netdev) struct dnet_device *dnet = to_dnet(netdev); u16 tmp; - tmp = cpu_to_be16(*((u16 *)netdev->enetaddr)); + tmp = get_unaligned_be16(netdev->enetaddr); dnet_writew_mac(dnet, DNET_INTERNAL_MAC_ADDR_0_REG, tmp); - tmp = cpu_to_be16(*((u16 *)(netdev->enetaddr + 2))); + tmp = get_unaligned_be16(&netdev->enetaddr[2]); dnet_writew_mac(dnet, DNET_INTERNAL_MAC_ADDR_1_REG, tmp); - tmp = cpu_to_be16(*((u16 *)(netdev->enetaddr + 4))); + tmp = get_unaligned_be16(&netdev->enetaddr[4]); dnet_writew_mac(dnet, DNET_INTERNAL_MAC_ADDR_2_REG, tmp); }