Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8efa59fc authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by Greg Kroah-Hartman
Browse files

netfilter: nf_conntrack_pptp: fix compilation warning with W=1 build 



commit 4946ea5c1237036155c3b3a24f049fd5f849f8f6 upstream.

>> include/linux/netfilter/nf_conntrack_pptp.h:13:20: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
extern const char *const pptp_msg_name(u_int16_t msg);
^~~~~~

Reported-by: default avatarkbuild test robot <lkp@intel.com>
Fixes: 4c559f15efcc ("netfilter: nf_conntrack_pptp: prevent buffer overflows in debug code")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8a37da13

include/linux/netfilter/nf_conntrack_pptp.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


#include <linux/netfilter/nf_conntrack_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 {

net/netfilter/nf_conntrack_pptp.c

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static const char *const pptp_msg_name_array[PPTP_MSG_MAX + 1] = { 
	[PPTP_SET_LINK_INFO]		= "SET_LINK_INFO"

};



const char *const pptp_msg_name(u_int16_t msg)

const char *pptp_msg_name(u_int16_t msg)

{

	if (msg > PPTP_MSG_MAX)

		return pptp_msg_name_array[0];