Commit 63d57cd6 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by David S. Miller
Browse files

phonet: Use netif_rx(). 



Since commit
   baebdf48 ("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: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d33d0dc9

net/phonet/af_phonet.c

+4 −4
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ EXPORT_SYMBOL(phonet_header_ops); 
 * Prepends an ISI header and sends a datagram.

 */

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;

	int err;
@@ -182,7 +182,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);

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

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

	} else {

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

					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_put(skb, 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))

		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);

	return err;