diff --git a/[refs] b/[refs]
index b52e2c6e0dec..fb29b26e7d38 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5918e2fb9035b35164002c3a268feaf70b7c04d5
+refs/heads/master: 55c95e738da85373965cb03b4f975d0fd559865b
diff --git a/trunk/drivers/net/pppoe.c b/trunk/drivers/net/pppoe.c
index 805b64d1e893..7ebb8e87efa4 100644
--- a/trunk/drivers/net/pppoe.c
+++ b/trunk/drivers/net/pppoe.c
@@ -949,7 +949,7 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb)
 
 abort:
 	kfree_skb(skb);
-	return 1;
+	return 0;
 }
 
 /************************************************************************