commit bc0b2168aed1ecf0d71975af12d4f0ffecb92bfc
author Eric Dumazet <edumazet@google.com> Tue Sep 04 15:54:55 2012 -0400
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> Sat Oct 13 05:38:45 2012 +0900
tree d2ee7751cd2a384bde844f75ac38b10c3e8a815d
parent 28ad5c792deb17e1274cef32c59049d2062ed1b3

l2tp: fix a typo in l2tp_eth_dev_recv()

[ Upstream commit c0cc88a7627c333de50b07b7c60b1d49d9d2e6cc ]

While investigating l2tp bug, I hit a bug in eth_type_trans(),
because not enough bytes were pulled in skb head.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

net/l2tp/l2tp_eth.c

diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
index 7446038..5c82907 100644
--- a/net/l2tp/l2tp_eth.c
+++ b/net/l2tp/l2tp_eth.c
@@ -132,7 +132,7 @@
 		printk("\n");
 	}
 
-	if (!pskb_may_pull(skb, sizeof(ETH_HLEN)))
+	if (!pskb_may_pull(skb, ETH_HLEN))
 		goto error;
 
 	secpath_reset(skb);