From: Trilok Soni Date: Tue, 8 May 2007 13:10:54 +0000 (+0530) Subject: IrDA: Fix omap-ir build X-Git-Tag: v2.6.22-omap1~162 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=3e7c8b7ca323c9c2f2114f489d1910737d8dc54d;p=linux-2.6-omap-h63xx.git IrDA: Fix omap-ir build - use new skb_reset_mac_header and skb_copy_from_linear_data functions. Signed-off-by: Trilok Soni Signed-off-by: Tony Lindgren --- diff --git a/drivers/net/irda/omap-ir.c b/drivers/net/irda/omap-ir.c index 85658dcddd8..1fc8c318179 100644 --- a/drivers/net/irda/omap-ir.c +++ b/drivers/net/irda/omap-ir.c @@ -395,7 +395,7 @@ omap_irda_irq(int irq, void *dev_id) w - 4); skb->dev = dev; - skb->mac.raw = skb->data; + skb_reset_mac_header(skb); skb->protocol = htons(ETH_P_IRDA); omap_ir->stats.rx_packets++; omap_ir->stats.rx_bytes += skb->len; @@ -444,7 +444,7 @@ static int omap_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev) netif_stop_queue(dev); /* Copy skb data to DMA buffer */ - memcpy(omap_ir->tx_buf_dma_virt, skb->data, skb->len); + skb_copy_from_linear_data(skb, omap_ir->tx_buf_dma_virt, skb->len); /* Copy skb data to DMA buffer */ omap_ir->stats.tx_bytes += skb->len;