]> err.no Git - linux-2.6/commitdiff
[WAN] hdlc_cisco: Fix regression introduced by skb->tail changes.
authorKrzysztof Halasa <khc@pm.waw.pl>
Mon, 19 Sep 2005 22:39:32 +0000 (15:39 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 19 Sep 2005 22:39:32 +0000 (15:39 -0700)
The following commit breaks cisco mode with my WAN drivers:
author David S. Miller <davem@davemloft.net>
Tue, 28 Jun 2005 22:25:31 +0000 (15:25 -0700)
commit 689be43945e9ca7dd704522e55af1b8a73a994d3

"[NET]: Remove gratuitous use of skb->tail in network drivers."

The following patch fixes it - please apply (cisco_hard_header does
skb_push(4 bytes)).

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/wan/hdlc_cisco.c

index 48c03c11cd9a36bc28b115fe3a52c1c0ccbe9362..a01efa6d5c629bd81457a64769f015f75ebea4c7 100644 (file)
@@ -72,7 +72,7 @@ static void cisco_keepalive_send(struct net_device *dev, u32 type,
        }
        skb_reserve(skb, 4);
        cisco_hard_header(skb, dev, CISCO_KEEPALIVE, NULL, NULL, 0);
-       data = (cisco_packet*)skb->data;
+       data = (cisco_packet*)(skb->data + 4);
 
        data->type = htonl(type);
        data->par1 = htonl(par1);