Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b765e84f authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont Committed by David S. Miller
Browse files

Phonet: return an error when packet TX fails 



Phonet assumes that packets are never dropped. We try our best to
avoid this situation. But lets return ENOBUFS if queueing to the
network device fails so that the caller knows things went wrong.

Signed-off-by: default avatarRémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c69d4407

net/phonet/af_phonet.c

+3 −5
Original line number Diff line number Diff line
@@ -195,11 +195,7 @@ static int pn_send(struct sk_buff *skb, struct net_device *dev, 
	if (skb->pkt_type == PACKET_LOOPBACK) {

		skb_reset_mac_header(skb);

		skb_orphan(skb);

		if (irq)

			netif_rx(skb);

		else

			netif_rx_ni(skb);

		err = 0;

		err = (irq ? netif_rx(skb) : netif_rx_ni(skb)) ? -ENOBUFS : 0;

	} else {

		err = dev_hard_header(skb, dev, ntohs(skb->protocol),

					NULL, NULL, skb->len);
@@ -208,6 +204,8 @@ static int pn_send(struct sk_buff *skb, struct net_device *dev, 
			goto drop;

		}

		err = dev_queue_xmit(skb);

		if (unlikely(err > 0))

			err = net_xmit_errno(err);

	}



	return err;