aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/rx.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2008-05-16 16:20:00 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-05-22 05:59:33 -0400
commitd3208b5ebae9e62c32f0cf74dce1d4ddfac3f895 (patch)
treebbb47346216735e8e6ffb4c9f4be89ac0de0a12a /drivers/net/sfc/rx.c
parent5daab96d873721cb84f4583f232b88fcd67c51fb (diff)
sfc: Remove redundant casts to and from void *
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/sfc/rx.c')
-rw-r--r--drivers/net/sfc/rx.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/sfc/rx.c b/drivers/net/sfc/rx.c
index 88f87ef5e15f..601b001437c0 100644
--- a/drivers/net/sfc/rx.c
+++ b/drivers/net/sfc/rx.c
@@ -109,7 +109,7 @@ static inline unsigned int efx_rx_buf_size(struct efx_nic *efx)
109static int efx_lro_get_skb_hdr(struct sk_buff *skb, void **ip_hdr, 109static int efx_lro_get_skb_hdr(struct sk_buff *skb, void **ip_hdr,
110 void **tcpudp_hdr, u64 *hdr_flags, void *priv) 110 void **tcpudp_hdr, u64 *hdr_flags, void *priv)
111{ 111{
112 struct efx_channel *channel = (struct efx_channel *)priv; 112 struct efx_channel *channel = priv;
113 struct iphdr *iph; 113 struct iphdr *iph;
114 struct tcphdr *th; 114 struct tcphdr *th;
115 115
@@ -134,12 +134,12 @@ static int efx_get_frag_hdr(struct skb_frag_struct *frag, void **mac_hdr,
134 void **ip_hdr, void **tcpudp_hdr, u64 *hdr_flags, 134 void **ip_hdr, void **tcpudp_hdr, u64 *hdr_flags,
135 void *priv) 135 void *priv)
136{ 136{
137 struct efx_channel *channel = (struct efx_channel *)priv; 137 struct efx_channel *channel = priv;
138 struct ethhdr *eh; 138 struct ethhdr *eh;
139 struct iphdr *iph; 139 struct iphdr *iph;
140 140
141 /* We support EtherII and VLAN encapsulated IPv4 */ 141 /* We support EtherII and VLAN encapsulated IPv4 */
142 eh = (struct ethhdr *)(page_address(frag->page) + frag->page_offset); 142 eh = page_address(frag->page) + frag->page_offset;
143 *mac_hdr = eh; 143 *mac_hdr = eh;
144 144
145 if (eh->h_proto == htons(ETH_P_IP)) { 145 if (eh->h_proto == htons(ETH_P_IP)) {
@@ -283,7 +283,7 @@ static inline int efx_init_rx_buffer_page(struct efx_rx_queue *rx_queue,
283 283
284 rx_queue->buf_page = rx_buf->page; 284 rx_queue->buf_page = rx_buf->page;
285 rx_queue->buf_dma_addr = dma_addr; 285 rx_queue->buf_dma_addr = dma_addr;
286 rx_queue->buf_data = ((char *) page_address(rx_buf->page) + 286 rx_queue->buf_data = (page_address(rx_buf->page) +
287 EFX_PAGE_IP_ALIGN); 287 EFX_PAGE_IP_ALIGN);
288 } 288 }
289 289