From: Lennert Buytenhek Date: Sun, 1 Jun 2008 09:16:21 +0000 (+0200) Subject: mv643xx_eth: get rid of RX_BUF_OFFSET X-Git-Tag: v2.6.27-rc1~969^2~289^2~12^2~27 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0a6cf74dd5ec440b7681880984d9455353f673ec;p=karo-tx-linux.git mv643xx_eth: get rid of RX_BUF_OFFSET Get rid of RX_BUF_OFFSET (which is synonymous with ETH_HW_IP_ALIGN). Signed-off-by: Lennert Buytenhek Acked-by: Dale Farnsworth --- diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index ba1348f3b25b..fea99b7fb6a4 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c @@ -169,9 +169,6 @@ static char mv643xx_driver_version[] = "1.0"; #define PORT_DEFAULT_TRANSMIT_QUEUE_SIZE 800 #define PORT_DEFAULT_RECEIVE_QUEUE_SIZE 400 -/* Buffer offset from buffer pointer */ -#define RX_BUF_OFFSET 0x2 - /* Gigabit Ethernet Unit Global Registers */ /* MIB Counters register definitions */ @@ -691,9 +688,9 @@ static ETH_FUNC_RET_STATUS eth_port_receive(struct mv643xx_private *mp, return ETH_END_OF_JOB; } - p_pkt_info->byte_cnt = (p_rx_desc->byte_cnt) - RX_BUF_OFFSET; + p_pkt_info->byte_cnt = p_rx_desc->byte_cnt - ETH_HW_IP_ALIGN; p_pkt_info->cmd_sts = command_status; - p_pkt_info->buf_ptr = (p_rx_desc->buf_ptr) + RX_BUF_OFFSET; + p_pkt_info->buf_ptr = p_rx_desc->buf_ptr + ETH_HW_IP_ALIGN; p_pkt_info->return_info = mp->rx_skb[rx_curr_desc]; p_pkt_info->l4i_chk = p_rx_desc->buf_size;