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

Commit 53c718f6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: Move NAT invalid protocol define to uapi"

parents 255271b9 32ffdb87

drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_nat.c

+1 −2
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2017-2018 The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * it under the terms of the GNU General Public License version 2 and
@@ -17,7 +17,6 @@ 




#define IPA_64_LOW_32_MASK (0xFFFFFFFF)

#define IPA_64_LOW_32_MASK (0xFFFFFFFF)

#define IPA_64_HIGH_32_MASK (0xFFFFFFFF00000000ULL)

#define IPA_64_HIGH_32_MASK (0xFFFFFFFF00000000ULL)

#define IPAHAL_NAT_INVALID_PROTOCOL (0xFF)





static const char *ipahal_nat_type_to_str[IPA_NAT_MAX] = {

static const char *ipahal_nat_type_to_str[IPA_NAT_MAX] = {

	__stringify(IPAHAL_NAT_IPV4),

	__stringify(IPAHAL_NAT_IPV4),

include/uapi/linux/msm_ipa.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -35,6 +35,11 @@ 
 */

 */

#define IPA_DFLT_RT_TBL_NAME "ipa_dflt_rt"

#define IPA_DFLT_RT_TBL_NAME "ipa_dflt_rt"





/**

 * name for default value of invalid protocol of NAT

 */

#define IPAHAL_NAT_INVALID_PROTOCOL   0xFF



/**

/**

 * commands supported by IPA driver

 * commands supported by IPA driver

 */

 */