diff options
Diffstat (limited to 'net/tipc/core.h')
| -rw-r--r-- | net/tipc/core.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/core.h b/net/tipc/core.h index 94895d4e86ab..4dfe137587bb 100644 --- a/net/tipc/core.h +++ b/net/tipc/core.h | |||
| @@ -47,7 +47,7 @@ | |||
| 47 | #include <linux/mm.h> | 47 | #include <linux/mm.h> |
| 48 | #include <linux/timer.h> | 48 | #include <linux/timer.h> |
| 49 | #include <linux/string.h> | 49 | #include <linux/string.h> |
| 50 | #include <asm/uaccess.h> | 50 | #include <linux/uaccess.h> |
| 51 | #include <linux/interrupt.h> | 51 | #include <linux/interrupt.h> |
| 52 | #include <linux/atomic.h> | 52 | #include <linux/atomic.h> |
| 53 | #include <asm/hardirq.h> | 53 | #include <asm/hardirq.h> |
| @@ -90,7 +90,6 @@ extern int tipc_random __read_mostly; | |||
| 90 | /* | 90 | /* |
| 91 | * Routines available to privileged subsystems | 91 | * Routines available to privileged subsystems |
| 92 | */ | 92 | */ |
| 93 | int tipc_core_start_net(unsigned long); | ||
| 94 | int tipc_handler_start(void); | 93 | int tipc_handler_start(void); |
| 95 | void tipc_handler_stop(void); | 94 | void tipc_handler_stop(void); |
| 96 | int tipc_netlink_start(void); | 95 | int tipc_netlink_start(void); |
| @@ -192,6 +191,7 @@ static inline void k_term_timer(struct timer_list *timer) | |||
| 192 | 191 | ||
| 193 | struct tipc_skb_cb { | 192 | struct tipc_skb_cb { |
| 194 | void *handle; | 193 | void *handle; |
| 194 | bool deferred; | ||
| 195 | }; | 195 | }; |
| 196 | 196 | ||
| 197 | #define TIPC_SKB_CB(__skb) ((struct tipc_skb_cb *)&((__skb)->cb[0])) | 197 | #define TIPC_SKB_CB(__skb) ((struct tipc_skb_cb *)&((__skb)->cb[0])) |
