git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
[pandora-kernel.git]
/
net
/
l2tp
/
l2tp_core.c
diff --git
a/net/l2tp/l2tp_core.c
b/net/l2tp/l2tp_core.c
index
bf8d50c
..
cf0f308
100644
(file)
--- a/
net/l2tp/l2tp_core.c
+++ b/
net/l2tp/l2tp_core.c
@@
-756,9
+756,6
@@
static int l2tp_udp_recv_core(struct l2tp_tunnel *tunnel, struct sk_buff *skb,
goto error;
}
goto error;
}
- /* Point to L2TP header */
- optr = ptr = skb->data;
-
/* Trace packet contents, if enabled */
if (tunnel->debug & L2TP_MSG_DATA) {
length = min(32u, skb->len);
/* Trace packet contents, if enabled */
if (tunnel->debug & L2TP_MSG_DATA) {
length = min(32u, skb->len);
@@
-769,12
+766,15
@@
static int l2tp_udp_recv_core(struct l2tp_tunnel *tunnel, struct sk_buff *skb,
offset = 0;
do {
offset = 0;
do {
- printk(" %02X",
ptr
[offset]);
+ printk(" %02X",
skb->data
[offset]);
} while (++offset < length);
printk("\n");
}
} while (++offset < length);
printk("\n");
}
+ /* Point to L2TP header */
+ optr = ptr = skb->data;
+
/* Get L2TP header flags */
hdrflags = ntohs(*(__be16 *) ptr);
/* Get L2TP header flags */
hdrflags = ntohs(*(__be16 *) ptr);