aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/core/dev.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 582db646cc54..424d6d0e98f8 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1673,9 +1673,9 @@ static void net_tx_action(struct softirq_action *h)
1673 } 1673 }
1674} 1674}
1675 1675
1676static __inline__ int deliver_skb(struct sk_buff *skb, 1676static inline int deliver_skb(struct sk_buff *skb,
1677 struct packet_type *pt_prev, 1677 struct packet_type *pt_prev,
1678 struct net_device *orig_dev) 1678 struct net_device *orig_dev)
1679{ 1679{
1680 atomic_inc(&skb->users); 1680 atomic_inc(&skb->users);
1681 return pt_prev->func(skb, skb->dev, pt_prev, orig_dev); 1681 return pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
@@ -2065,7 +2065,7 @@ static int dev_ifconf(char __user *arg)
2065 * This is invoked by the /proc filesystem handler to display a device 2065 * This is invoked by the /proc filesystem handler to display a device
2066 * in detail. 2066 * in detail.
2067 */ 2067 */
2068static __inline__ struct net_device *dev_get_idx(loff_t pos) 2068static struct net_device *dev_get_idx(loff_t pos)
2069{ 2069{
2070 struct net_device *dev; 2070 struct net_device *dev;
2071 loff_t i; 2071 loff_t i;
@@ -2836,7 +2836,7 @@ static int dev_boot_phase = 1;
2836static DEFINE_SPINLOCK(net_todo_list_lock); 2836static DEFINE_SPINLOCK(net_todo_list_lock);
2837static struct list_head net_todo_list = LIST_HEAD_INIT(net_todo_list); 2837static struct list_head net_todo_list = LIST_HEAD_INIT(net_todo_list);
2838 2838
2839static inline void net_set_todo(struct net_device *dev) 2839static void net_set_todo(struct net_device *dev)
2840{ 2840{
2841 spin_lock(&net_todo_list_lock); 2841 spin_lock(&net_todo_list_lock);
2842 list_add_tail(&dev->todo_list, &net_todo_list); 2842 list_add_tail(&dev->todo_list, &net_todo_list);