diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-12-21 11:54:34 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-12-21 11:54:34 +1100 |
| commit | 781aec55c1b640d930234898135d3ae397de4696 (patch) | |
| tree | eca6e6c569fc9520af142b993411885d642eda25 /net/netfilter/nfnetlink_cthelper.c | |
| parent | 9248af3951e80313806989efa70a49b86002d94e (diff) | |
| parent | 8b91842156ea21ca66be52fc97db44b8f16951bf (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'net/netfilter/nfnetlink_cthelper.c')
| -rw-r--r-- | net/netfilter/nfnetlink_cthelper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nfnetlink_cthelper.c b/net/netfilter/nfnetlink_cthelper.c index 3b79f34b5095..de8782345c86 100644 --- a/net/netfilter/nfnetlink_cthelper.c +++ b/net/netfilter/nfnetlink_cthelper.c @@ -48,7 +48,7 @@ nfnl_userspace_cthelper(struct sk_buff *skb, unsigned int protoff, if (helper == NULL) return NF_DROP; - /* This is an user-space helper not yet configured, skip. */ + /* This is a user-space helper not yet configured, skip. */ if ((helper->flags & (NF_CT_HELPER_F_USERSPACE | NF_CT_HELPER_F_CONFIGURED)) == NF_CT_HELPER_F_USERSPACE) |