allow LEGACY_PTYS to be set to 0

[linux-2.6-omap-h63xx.git] / net / irda / wrapper.c

diff --git a/net/irda/wrapper.c b/net/irda/wrapper.c
index 5abfb71aae8db6045d76236a4dd0285c4296bd31..e71286768a480994141f6d9b97b270c212112ccf 100644 (file)
--- a/net/irda/wrapper.c
+++ b/net/irda/wrapper.c
@@ -20,7 +20,7 @@
  *     published by the Free Software Foundation; either version 2 of
  *     the License, or (at your option) any later version.
  *
- *     Neither Dag Brattli nor University of Tromsø admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
  *     provide warranty for any of this software. This material is
  *     provided "AS-IS" and at no charge.
  *
@@ -239,7 +239,8 @@ async_bump(struct net_device *dev,
 
        if(docopy) {
                /* Copy data without CRC (lenght already checked) */
-               memcpy(newskb->data, rx_buff->data, rx_buff->len - 2);
+               skb_copy_to_linear_data(newskb, rx_buff->data,
+                                       rx_buff->len - 2);
                /* Deliver this skb */
                dataskb = newskb;
        } else {
@@ -256,7 +257,7 @@ async_bump(struct net_device *dev,
 
        /* Feed it to IrLAP layer */
        dataskb->dev = dev;
-       dataskb->mac.raw  = dataskb->data;
+       skb_reset_mac_header(dataskb);
        dataskb->protocol = htons(ETH_P_IRDA);
 
        netif_rx(dataskb);