commit 4dd820c088d201e526840c9dbc2f0b87a0a41868
author Sjur Brændeland <sjur.brandeland@stericsson.com> Mon Apr 11 10:43:51 2011 +0000
committer David S. Miller <davem@davemloft.net> Mon Apr 11 15:08:48 2011 -0700
tree fac7a3a70bd32df3104ae6f1273a727fb0fa006f
parent 73d6ac633c6c0ca703f90db0b808d9593e46aef6

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>

net/caif/cfvidl.c

diff --git a/net/caif/cfvidl.c b/net/caif/cfvidl.c
index bf6fef2..b2f5989 100644
--- a/net/caif/cfvidl.c
+++ b/net/caif/cfvidl.c
@@ -60,8 +60,5 @@
 	info = cfpkt_info(pkt);
 	info->channel_id = service->layer.id;
 	info->dev_info = &service->dev_info;
-	ret = layr->dn->transmit(layr->dn, pkt);
-	if (ret < 0)
-		cfpkt_extr_head(pkt, &videoheader, 4);
-	return ret;
+	return layr->dn->transmit(layr->dn, pkt);
 }