diff options
| author | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2009-09-21 05:09:22 -0400 |
|---|---|---|
| committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2009-09-21 05:09:22 -0400 |
| commit | 7cce2f4cb7f5f641f78c8e3eea4e7b1b96cb71c0 (patch) | |
| tree | b064d077928cf224660ab1e1841cdab2c9fd8b08 /include/net/udp.h | |
| parent | e055f7e873d900925c222cf2d1ec955af4a9ca90 (diff) | |
| parent | ebc79c4f8da0f92efa968e0328f32334a2ce80cf (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into linux-next
Conflicts:
fs/ubifs/super.c
Merge the upstream tree in order to resolve a conflict with the
per-bdi writeback changes from the linux-2.6-block tree.
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 */ |