IrDA: Fix omap-ir build

- use new skb_reset_mac_header and
  skb_copy_from_linear_data functions.

Signed-off-by: Trilok Soni <soni.trilok@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/net/irda/omap-ir.c b/drivers/net/irda/omap-ir.c
index 85658dcddd8e02896914ceaaf36ffb89d8632186..1fc8c318179cadcb76628c933c94be653947fd7b 100644 (file)
--- 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;