diff options
| author | Sjur Brændeland <sjur.brandeland@stericsson.com> | 2011-04-11 14:43:51 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-12 02:08:48 +0400 |
| commit | 4dd820c088d201e526840c9dbc2f0b87a0a41868 (patch) | |
| tree | fac7a3a70bd32df3104ae6f1273a727fb0fa006f /net/caif/caif_dev.c | |
| parent | 73d6ac633c6c0ca703f90db0b808d9593e46aef6 (diff) | |
| download | linux-4dd820c088d201e526840c9dbc2f0b87a0a41868.tar.xz | |
caif: Don't resend if dev_queue_xmit fails.
If CAIF Link Layer returns an error, we no longer try to re-build the
CAIF packet and resend it. Instead, we simply return any transmission
errors to the socket client.
Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/caif/caif_dev.c')
| -rw-r--r-- | net/caif/caif_dev.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c index b533bb09a002..a518fdd4da0a 100644 --- a/net/caif/caif_dev.c +++ b/net/caif/caif_dev.c @@ -120,25 +120,12 @@ static int transmit(struct cflayer *layer, struct cfpkt *pkt) { struct caif_device_entry *caifd = container_of(layer, struct caif_device_entry, layer); - struct sk_buff *skb, *skb2; - int ret = -EINVAL; + struct sk_buff *skb; + skb = cfpkt_tonative(pkt); skb->dev = caifd->netdev; - /* - * Don't allow SKB to be destroyed upon error, but signal resend - * notification to clients. We can't rely on the return value as - * congestion (NET_XMIT_CN) sometimes drops the packet, sometimes don't. - */ - if (netif_queue_stopped(caifd->netdev)) - return -EAGAIN; - skb2 = skb_get(skb); - - ret = dev_queue_xmit(skb2); - - if (!ret) - kfree_skb(skb); - else - return -EAGAIN; + + dev_queue_xmit(skb); return 0; } |