From f37b3a5a9cbb99e0653790dd3cb9a9378376d67f Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Fri, 12 Jun 2009 05:20:01 +0000 Subject: [PATCH] --- yaml --- r: 150933 b: refs/heads/master c: 98ca4a46d27348476c9196ebc0a0c5297431d90f h: refs/heads/master i: 150931: 5e74e396a03e6c3988d6e6346fb600f182daa6e4 v: v3 --- [refs] | 2 +- trunk/drivers/net/hamradio/bpqether.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2f554e671e7e..4976a1ffa10b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae71bafdd4ce29856addfede1ab7046f4e45775b +refs/heads/master: 98ca4a46d27348476c9196ebc0a0c5297431d90f diff --git a/trunk/drivers/net/hamradio/bpqether.c b/trunk/drivers/net/hamradio/bpqether.c index d509b371a562..5105548ad50c 100644 --- a/trunk/drivers/net/hamradio/bpqether.c +++ b/trunk/drivers/net/hamradio/bpqether.c @@ -274,7 +274,7 @@ static int bpq_xmit(struct sk_buff *skb, struct net_device *dev) if ((newskb = skb_realloc_headroom(skb, AX25_BPQ_HEADER_LEN)) == NULL) { printk(KERN_WARNING "bpqether: out of memory\n"); kfree_skb(skb); - return -ENOMEM; + return NETDEV_TX_OK; } if (skb->sk != NULL) @@ -294,7 +294,7 @@ static int bpq_xmit(struct sk_buff *skb, struct net_device *dev) if ((dev = bpq_get_ether_dev(dev)) == NULL) { dev->stats.tx_dropped++; kfree_skb(skb); - return -ENODEV; + return NETDEV_TX_OK; } skb->protocol = ax25_type_trans(skb, dev);