Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 43171
b: refs/heads/master
c: 9ee0779
h: refs/heads/master
i:
  43169: c105970
  43167: e1b981d
v: v3
  • Loading branch information
Yasuyuki Kozakai authored and David S. Miller committed Dec 7, 2006
1 parent eb11906 commit 7f6a4a3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f6677f4312ee74f8ca68c4cc4060465607b72b41
refs/heads/master: 9ee0779e994c6916863045297b831212e285da3b
3 changes: 2 additions & 1 deletion trunk/include/linux/netfilter/nf_conntrack_pptp.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
#ifndef _NF_CONNTRACK_PPTP_H
#define _NF_CONNTRACK_PPTP_H

#include <linux/netfilter/nf_conntrack_common.h>

/* state of the control session */
enum pptp_ctrlsess_state {
PPTP_SESSION_NONE, /* no session present */
Expand Down Expand Up @@ -295,7 +297,6 @@ union pptp_ctrl_union {
/* crap needed for nf_conntrack_compat.h */
struct nf_conn;
struct nf_conntrack_expect;
enum ip_conntrack_info;

extern int
(*nf_nat_pptp_hook_outbound)(struct sk_buff **pskb,
Expand Down

0 comments on commit 7f6a4a3

Please sign in to comment.