diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-17 14:52:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-17 14:53:10 -0400 |
| commit | 45bd00d31de886f8425b4dd33204b911b0a466a9 (patch) | |
| tree | 06204f2452e02ca916666173d50f5035d69065ef /include/net/udp.h | |
| parent | 40d9d82c8ab8c4e2373a23a1e31dc8d84c53aa01 (diff) | |
| parent | ab86e5765d41a5eb4239a1c04d613db87bea5ed8 (diff) | |
Merge branch 'linus' into tracing/core
Merge reason: Pick up kernel/softirq.c update for dependent fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/net/udp.h')
| -rw-r--r-- | include/net/udp.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/udp.h b/include/net/udp.h index 90e6ce56be65..5fb029f817a3 100644 --- a/include/net/udp.h +++ b/include/net/udp.h | |||
| @@ -207,4 +207,7 @@ extern void udp4_proc_exit(void); | |||
| 207 | #endif | 207 | #endif |
| 208 | 208 | ||
| 209 | extern void udp_init(void); | 209 | extern void udp_init(void); |
| 210 | |||
| 211 | extern int udp4_ufo_send_check(struct sk_buff *skb); | ||
| 212 | extern struct sk_buff *udp4_ufo_fragment(struct sk_buff *skb, int features); | ||
| 210 | #endif /* _UDP_H */ | 213 | #endif /* _UDP_H */ |