diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-19 18:46:11 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-19 18:46:11 -0700 |
commit | 875bd5ab01bc0b760fd4e97838931cd2e7456cbd (patch) | |
tree | b921bc8feb0e0d6f2537987cd820429b15804a87 /drivers | |
parent | 6d1cfe3f1752f17e297df60c8bcc6cd6e0a58449 (diff) | |
parent | e14c3caf605dfd29bd1aac3097e39db94afc9f07 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wan/hdlc_cisco.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/hdlc_cisco.c b/drivers/net/wan/hdlc_cisco.c index 48c03c11cd9..a01efa6d5c6 100644 --- a/drivers/net/wan/hdlc_cisco.c +++ b/drivers/net/wan/hdlc_cisco.c @@ -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); |