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

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
...@@ -195,11 +195,7 @@ static int pn_send(struct sk_buff *skb, struct net_device *dev, ...@@ -195,11 +195,7 @@ static int pn_send(struct sk_buff *skb, struct net_device *dev,
if (skb->pkt_type == PACKET_LOOPBACK) { if (skb->pkt_type == PACKET_LOOPBACK) {
skb_reset_mac_header(skb); skb_reset_mac_header(skb);
skb_orphan(skb); skb_orphan(skb);
if (irq) err = (irq ? netif_rx(skb) : netif_rx_ni(skb)) ? -ENOBUFS : 0;
netif_rx(skb);
else
netif_rx_ni(skb);
err = 0;
} else { } else {
err = dev_hard_header(skb, dev, ntohs(skb->protocol), err = dev_hard_header(skb, dev, ntohs(skb->protocol),
NULL, NULL, skb->len); NULL, NULL, skb->len);
...@@ -208,6 +204,8 @@ static int pn_send(struct sk_buff *skb, struct net_device *dev, ...@@ -208,6 +204,8 @@ static int pn_send(struct sk_buff *skb, struct net_device *dev,
goto drop; goto drop;
} }
err = dev_queue_xmit(skb); err = dev_queue_xmit(skb);
if (unlikely(err > 0))
err = net_xmit_errno(err);
} }
return err; return err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment