Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

phonet: Use netif_rx().

Since commit
baebdf48c3600 ("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>

authored by

Sebastian Andrzej Siewior and committed by
David S. Miller
63d57cd6 d33d0dc9

+4 -4
+4 -4
net/phonet/af_phonet.c
··· 146 146 * Prepends an ISI header and sends a datagram. 147 147 */ 148 148 static int pn_send(struct sk_buff *skb, struct net_device *dev, 149 - u16 dst, u16 src, u8 res, u8 irq) 149 + u16 dst, u16 src, u8 res) 150 150 { 151 151 struct phonethdr *ph; 152 152 int err; ··· 182 182 if (skb->pkt_type == PACKET_LOOPBACK) { 183 183 skb_reset_mac_header(skb); 184 184 skb_orphan(skb); 185 - err = (irq ? netif_rx(skb) : netif_rx_ni(skb)) ? -ENOBUFS : 0; 185 + err = netif_rx(skb) ? -ENOBUFS : 0; 186 186 } else { 187 187 err = dev_hard_header(skb, dev, ntohs(skb->protocol), 188 188 NULL, NULL, skb->len); ··· 214 214 skb_reserve(skb, MAX_PHONET_HEADER); 215 215 __skb_put(skb, len); 216 216 skb_copy_to_linear_data(skb, data, len); 217 - return pn_send(skb, dev, dst, src, res, 1); 217 + return pn_send(skb, dev, dst, src, res); 218 218 } 219 219 220 220 /* ··· 269 269 if (!pn_addr(src)) 270 270 src = pn_object(saddr, pn_obj(src)); 271 271 272 - err = pn_send(skb, dev, dst, src, res, 0); 272 + err = pn_send(skb, dev, dst, src, res); 273 273 dev_put(dev); 274 274 return err; 275 275