diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-15 08:49:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-15 08:49:23 -0800 |
| commit | 7775aa7690c26b3c5606090a43533a7a7429eb91 (patch) | |
| tree | c7589a023107babbe88be1d03ab77c1838435629 /include/linux | |
| parent | [PATCH] CIFS: fix cifs_user_read oops when null SMB response on forcedirectio mount (diff) | |
| parent | [BRIDGE]: Fix deadlock in br_stp_disable_bridge (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netfilter_ipv4.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netfilter_ipv4.h b/include/linux/netfilter_ipv4.h index fdc4a9527343..43c09d790b83 100644 --- a/include/linux/netfilter_ipv4.h +++ b/include/linux/netfilter_ipv4.h @@ -79,7 +79,7 @@ enum nf_ip_hook_priorities { #ifdef __KERNEL__ extern int ip_route_me_harder(struct sk_buff **pskb); - +extern int ip_xfrm_me_harder(struct sk_buff **pskb); #endif /*__KERNEL__*/ #endif /*__LINUX_IP_NETFILTER_H*/ |