diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-28 20:54:18 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-28 20:54:18 +0300 |
| commit | 2200313aa054bb698f1a611193f4032339b390f3 (patch) | |
| tree | 08a08a809f60cf3880c1a032c74aea0eb3de6e99 /include/linux | |
| parent | 2b86cb8299765688c5119fd18d5f436716c81010 (diff) | |
| parent | 4946ea5c1237036155c3b3a24f049fd5f849f8f6 (diff) | |
| download | linux-2200313aa054bb698f1a611193f4032339b390f3.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for net:
1) Uninitialized when used in __nf_conntrack_update(), from
Nathan Chancellor.
2) Comparison of unsigned expression in nf_confirm_cthelper().
3) Remove 'const' type qualifier with no effect.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netfilter/nf_conntrack_pptp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netfilter/nf_conntrack_pptp.h b/include/linux/netfilter/nf_conntrack_pptp.h index 6a4ff6d5ebc2..a28aa289afdc 100644 --- a/include/linux/netfilter/nf_conntrack_pptp.h +++ b/include/linux/netfilter/nf_conntrack_pptp.h @@ -10,7 +10,7 @@ #include <net/netfilter/nf_conntrack_expect.h> #include <uapi/linux/netfilter/nf_conntrack_tuple_common.h> -extern const char *const pptp_msg_name(u_int16_t msg); +const char *pptp_msg_name(u_int16_t msg); /* state of the control session */ enum pptp_ctrlsess_state { |