From 9a886f9675e3b91bce14ab259d681e99062e7a47 Mon Sep 17 00:00:00 2001
From: Andrej Ota <andrej@ota.si>
Date: Sun, 12 Dec 2010 15:06:16 -0800
Subject: [PATCH] --- yaml --- r: 223258 b: refs/heads/master c:
 2a27a03d3a891e87ca33d27a858b4db734a4cbab h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c2f67ee085d1..28742bdc0645 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eaff9453d3e2b63969af93e9d42a85e803060121
+refs/heads/master: 2a27a03d3a891e87ca33d27a858b4db734a4cbab
diff --git a/trunk/drivers/net/pppoe.c b/trunk/drivers/net/pppoe.c
index d72fb0519a2a..78c0e3c9b2b5 100644
--- a/trunk/drivers/net/pppoe.c
+++ b/trunk/drivers/net/pppoe.c
@@ -948,7 +948,7 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb)
 
 abort:
 	kfree_skb(skb);
-	return 0;
+	return 1;
 }
 
 /************************************************************************