diff options
author | James Chapman <jchapman@katalix.com> | 2007-11-06 08:32:37 +0100 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-11-07 13:08:56 +0100 |
commit | 91781004b9c029ee55b7aa9ef950a373ba865dc6 (patch) | |
tree | f6dbfc665cdab40b2ce3ad82222115c5509beab5 /net/ipv4/proc.c | |
parent | [IPV4]: Clean the ip_sockglue.c from some ugly ifdefs (diff) | |
download | linux-91781004b9c029ee55b7aa9ef950a373ba865dc6.tar.xz linux-91781004b9c029ee55b7aa9ef950a373ba865dc6.zip |
[PPP]: L2TP: Fix oops in transmit and receive paths
Changes made on 18-sep to fix skb handling in the pppol2tp driver
broke the transmit and receive paths. Users are only running into this
now because distros are now using 2.6.23 and I must have messed up
when I tested the change.
For receive, we now do our own calculation of how much to pull from
the skb (variable length L2TP header) rather than using
skb_transport_offset(). Also, if the skb isn't a data packet, it must
be passed back to UDP with skb->data pointing to the UDP header.
For transmit, make sure skb->sk is set up because ip_queue_xmit()
needs it.
Signed-off-by: James Chapman <jchapman@katalix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/proc.c')
0 files changed, 0 insertions, 0 deletions