From 51393a691ff1b97b2f22c7f4fc8ec49ddcdb3c1a Mon Sep 17 00:00:00 2001
From: Rami Rosen <ramirose@gmail.com>
Date: Thu, 3 Jun 2010 05:02:29 +0000
Subject: [PATCH] --- yaml --- r: 202669 b: refs/heads/master c:
 55c95e738da85373965cb03b4f975d0fd559865b h: refs/heads/master i:   202667:
 371012d2e6c9c201f914b2724eacb32ca1329a61 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/pppoe.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;
 }
 
 /************************************************************************