diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-01-09 18:13:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-01-09 18:13:48 -0800 |
| commit | 9cb52295208d6a1b07cf1f6c2ec240f89179a589 (patch) | |
| tree | 10e1f065b63a692e5de655493c6f2fec7c722f37 /include/linux | |
| parent | 4823db34b8141dfd76bd2e739f018abd0481dd20 (diff) | |
| parent | 02538d82ebe4ac96cde918ae617c7ab3a1619d4a (diff) | |
Merge bk://linux-dj.bkbits.net/agpgart
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netfilter_ipv4/ip_nat_helper.h | 7 | ||||
| -rw-r--r-- | include/linux/sched.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/netfilter_ipv4/ip_nat_helper.h b/include/linux/netfilter_ipv4/ip_nat_helper.h index 2c1fb8d9bb54..8e2996f76fed 100644 --- a/include/linux/netfilter_ipv4/ip_nat_helper.h +++ b/include/linux/netfilter_ipv4/ip_nat_helper.h @@ -50,6 +50,13 @@ extern int ip_nat_mangle_tcp_packet(struct sk_buff **skb, unsigned int match_len, char *rep_buffer, unsigned int rep_len); +extern int ip_nat_mangle_udp_packet(struct sk_buff **skb, + struct ip_conntrack *ct, + enum ip_conntrack_info ctinfo, + unsigned int match_offset, + unsigned int match_len, + char *rep_buffer, + unsigned int rep_len); extern int ip_nat_seq_adjust(struct sk_buff *skb, struct ip_conntrack *ct, enum ip_conntrack_info ctinfo); diff --git a/include/linux/sched.h b/include/linux/sched.h index 9545a1957089..9916d377a74b 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -566,7 +566,7 @@ static inline void mmdrop(struct mm_struct * mm) /* mmput gets rid of the mappings and all user-space */ extern void mmput(struct mm_struct *); /* Remove the current tasks stale references to the old mm_struct */ -extern void mm_release(void); +extern void mm_release(struct task_struct *, struct mm_struct *); extern int copy_thread(int, unsigned long, unsigned long, unsigned long, struct task_struct *, struct pt_regs *); extern void flush_thread(void); |