summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorDavid S. Miller <davem@nuts.davemloft.net>2004-10-20 02:57:53 -0700
committerDavid S. Miller <davem@nuts.davemloft.net>2004-10-20 02:57:53 -0700
commit3ace873f40916682583562c1e1f324a4a50a2811 (patch)
treebd7382bbd71eb4f851a2651422249a7324162856 /include/linux
parent32889b396c55ef942640e9b48febcff90a490070 (diff)
[NET]: Uninline netif_rx_ni().
It expands to a lot of code when SMP or PREEMPT is enabled. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/netdevice.h16
1 files changed, 1 insertions, 15 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 9472745b6510..c102cdce2ebe 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -677,6 +677,7 @@ static inline void dev_kfree_skb_any(struct sk_buff *skb)
#define HAVE_NETIF_RX 1
extern int netif_rx(struct sk_buff *skb);
+extern int netif_rx_ni(struct sk_buff *skb);
#define HAVE_NETIF_RECEIVE_SKB 1
extern int netif_receive_skb(struct sk_buff *skb);
extern int dev_ioctl(unsigned int cmd, void __user *);
@@ -691,21 +692,6 @@ extern void dev_init(void);
extern int netdev_nit;
-/* Post buffer to the network code from _non interrupt_ context.
- * see net/core/dev.c for netif_rx description.
- */
-static inline int netif_rx_ni(struct sk_buff *skb)
-{
- int err = netif_rx(skb);
-
- preempt_disable();
- if (softirq_pending(smp_processor_id()))
- do_softirq();
- preempt_enable();
-
- return err;
-}
-
/* Called by rtnetlink.c:rtnl_unlock() */
extern void netdev_run_todo(void);