[SK_BUFF]: Introduce skb_reset_network_header(skb)

[mirror_ubuntu-artful-kernel.git] / net / irda / irlap_frame.c

diff --git a/net/irda/irlap_frame.c b/net/irda/irlap_frame.c
index dba349c832d02454b8451bbd02aa1935e23d9e15..7c815de4a3bf95671da2b366b030411794fa2074 100644 (file)
--- a/net/irda/irlap_frame.c
+++ b/net/irda/irlap_frame.c
@@ -93,7 +93,9 @@ void irlap_queue_xmit(struct irlap_cb *self, struct sk_buff *skb)
 {
        /* Some common init stuff */
        skb->dev = self->netdev;
-       skb->h.raw = skb->nh.raw = skb->mac.raw = skb->data;
+       skb_reset_mac_header(skb);
+       skb_reset_network_header(skb);
+       skb->h.raw = skb->data;
        skb->protocol = htons(ETH_P_IRDA);
        skb->priority = TC_PRIO_BESTEFFORT;
 
@@ -414,7 +416,7 @@ static void irlap_recv_discovery_xid_rsp(struct irlap_cb *self,
                IRDA_ERROR("%s: frame to short!\n", __FUNCTION__);
                return;
        }
-               
+
        xid = (struct xid_frame *) skb->data;
 
        info->daddr = le32_to_cpu(xid->saddr);
@@ -485,7 +487,7 @@ static void irlap_recv_discovery_xid_cmd(struct irlap_cb *self,
                IRDA_ERROR("%s: frame to short!\n", __FUNCTION__);
                return;
        }
-       
+
        xid = (struct xid_frame *) skb->data;
 
        info->daddr = le32_to_cpu(xid->saddr);
@@ -524,7 +526,7 @@ static void irlap_recv_discovery_xid_cmd(struct irlap_cb *self,
         */
        if (info->s == 0xff) {
                /* Check if things are sane at this point... */
-               if((discovery_info == NULL) || 
+               if((discovery_info == NULL) ||
                   !pskb_may_pull(skb, 3)) {
                        IRDA_ERROR("%s: discovery frame to short!\n",
                                   __FUNCTION__);