phonet: Use netif_rx().
Since commit
baebdf48c3
("net: dev: Makes sure netif_rx() can be invoked in any context.")
the function netif_rx() can be used in preemptible/thread context as
well as in interrupt context.
Use netif_rx().
Cc: Remi Denis-Courmont <courmisch@gmail.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
d33d0dc927
commit
63d57cd674
|
@ -146,7 +146,7 @@ EXPORT_SYMBOL(phonet_header_ops);
|
||||||
* Prepends an ISI header and sends a datagram.
|
* Prepends an ISI header and sends a datagram.
|
||||||
*/
|
*/
|
||||||
static int pn_send(struct sk_buff *skb, struct net_device *dev,
|
static int pn_send(struct sk_buff *skb, struct net_device *dev,
|
||||||
u16 dst, u16 src, u8 res, u8 irq)
|
u16 dst, u16 src, u8 res)
|
||||||
{
|
{
|
||||||
struct phonethdr *ph;
|
struct phonethdr *ph;
|
||||||
int err;
|
int err;
|
||||||
|
@ -182,7 +182,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);
|
||||||
err = (irq ? netif_rx(skb) : netif_rx_ni(skb)) ? -ENOBUFS : 0;
|
err = netif_rx(skb) ? -ENOBUFS : 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);
|
||||||
|
@ -214,7 +214,7 @@ static int pn_raw_send(const void *data, int len, struct net_device *dev,
|
||||||
skb_reserve(skb, MAX_PHONET_HEADER);
|
skb_reserve(skb, MAX_PHONET_HEADER);
|
||||||
__skb_put(skb, len);
|
__skb_put(skb, len);
|
||||||
skb_copy_to_linear_data(skb, data, len);
|
skb_copy_to_linear_data(skb, data, len);
|
||||||
return pn_send(skb, dev, dst, src, res, 1);
|
return pn_send(skb, dev, dst, src, res);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -269,7 +269,7 @@ int pn_skb_send(struct sock *sk, struct sk_buff *skb,
|
||||||
if (!pn_addr(src))
|
if (!pn_addr(src))
|
||||||
src = pn_object(saddr, pn_obj(src));
|
src = pn_object(saddr, pn_obj(src));
|
||||||
|
|
||||||
err = pn_send(skb, dev, dst, src, res, 0);
|
err = pn_send(skb, dev, dst, src, res);
|
||||||
dev_put(dev);
|
dev_put(dev);
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue