diff --git a/[refs] b/[refs] index 39b071974bf7..34c17a5171ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5588b40d7c2bff75ee573ed42d1738c73ce24492 +refs/heads/master: 21d0c83302fb742b7ffb6089d40196166102f5ed diff --git a/trunk/drivers/net/pppoe.c b/trunk/drivers/net/pppoe.c index 0d7f570b9a54..9b30cd600a64 100644 --- a/trunk/drivers/net/pppoe.c +++ b/trunk/drivers/net/pppoe.c @@ -879,8 +879,7 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb) dev->hard_header(skb, dev, ETH_P_PPP_SES, po->pppoe_pa.remote, NULL, data_len); - if (dev_queue_xmit(skb) < 0) - goto abort; + dev_queue_xmit(skb); return 1;