diff options
author | Lennert Buytenhek <buytenh@wantstofly.org> | 2008-06-01 05:16:21 -0400 |
---|---|---|
committer | Lennert Buytenhek <buytenh@wantstofly.org> | 2008-06-12 02:40:27 -0400 |
commit | 0a6cf74dd5ec440b7681880984d9455353f673ec (patch) | |
tree | 71f46d0559c3f6063aa6a132f55c38f5c0dbbf2b | |
parent | e1bea50ac4e950ea3249cfed219f49d6be22d280 (diff) |
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 <buytenh@marvell.com>
Acked-by: Dale Farnsworth <dale@farnsworth.org>
-rw-r--r-- | drivers/net/mv643xx_eth.c | 7 |
1 files changed, 2 insertions, 5 deletions
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"; | |||
169 | #define PORT_DEFAULT_TRANSMIT_QUEUE_SIZE 800 | 169 | #define PORT_DEFAULT_TRANSMIT_QUEUE_SIZE 800 |
170 | #define PORT_DEFAULT_RECEIVE_QUEUE_SIZE 400 | 170 | #define PORT_DEFAULT_RECEIVE_QUEUE_SIZE 400 |
171 | 171 | ||
172 | /* Buffer offset from buffer pointer */ | ||
173 | #define RX_BUF_OFFSET 0x2 | ||
174 | |||
175 | /* Gigabit Ethernet Unit Global Registers */ | 172 | /* Gigabit Ethernet Unit Global Registers */ |
176 | 173 | ||
177 | /* MIB Counters register definitions */ | 174 | /* MIB Counters register definitions */ |
@@ -691,9 +688,9 @@ static ETH_FUNC_RET_STATUS eth_port_receive(struct mv643xx_private *mp, | |||
691 | return ETH_END_OF_JOB; | 688 | return ETH_END_OF_JOB; |
692 | } | 689 | } |
693 | 690 | ||
694 | p_pkt_info->byte_cnt = (p_rx_desc->byte_cnt) - RX_BUF_OFFSET; | 691 | p_pkt_info->byte_cnt = p_rx_desc->byte_cnt - ETH_HW_IP_ALIGN; |
695 | p_pkt_info->cmd_sts = command_status; | 692 | p_pkt_info->cmd_sts = command_status; |
696 | p_pkt_info->buf_ptr = (p_rx_desc->buf_ptr) + RX_BUF_OFFSET; | 693 | p_pkt_info->buf_ptr = p_rx_desc->buf_ptr + ETH_HW_IP_ALIGN; |
697 | p_pkt_info->return_info = mp->rx_skb[rx_curr_desc]; | 694 | p_pkt_info->return_info = mp->rx_skb[rx_curr_desc]; |
698 | p_pkt_info->l4i_chk = p_rx_desc->buf_size; | 695 | p_pkt_info->l4i_chk = p_rx_desc->buf_size; |
699 | 696 | ||