History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Two trivial overlapping changes conflicts in MPLS and mlx5.

David S. Miller committed 9 years ago

Commit 4e8f2fc2 parents 158f323 1b1bc42485 files · +4555 −2689Browse files

Showing the changes to include/uapi/linux (3 of 485 files). Show all

Unified · Split

3 files
  1. include/uapi/linux/cec-funcs.h +7 −3
  2. include/uapi/linux/netfilter/nf_log.h +2 −0
  3. include/uapi/linux/netfilter/nf_tables.h +2 −2
include/uapi/linux/cec-funcs.h+7−3
@@ -1665,14 +1665,15 @@ static inline void cec_msg_report_current_latency(struct cec_msg *msg, · 1664 unmodified lines
1665 __u8 audio_out_compensated,1665 __u8 audio_out_compensated,
1666 __u8 audio_out_delay)1666 __u8 audio_out_delay)
1667{1667{
1668 msg->len = 7;1668 msg->len = 6;
1669 msg->msg[0] |= 0xf; /* broadcast */1669 msg->msg[0] |= 0xf; /* broadcast */
1670 msg->msg[1] = CEC_MSG_REPORT_CURRENT_LATENCY;1670 msg->msg[1] = CEC_MSG_REPORT_CURRENT_LATENCY;
1671 msg->msg[2] = phys_addr >> 8;1671 msg->msg[2] = phys_addr >> 8;
1672 msg->msg[3] = phys_addr & 0xff;1672 msg->msg[3] = phys_addr & 0xff;
1673 msg->msg[4] = video_latency;1673 msg->msg[4] = video_latency;
1674 msg->msg[5] = (low_latency_mode << 2) | audio_out_compensated;1674 msg->msg[5] = (low_latency_mode << 2) | audio_out_compensated;
1675 msg->msg[6] = audio_out_delay;1675 if (audio_out_compensated == 3)
1676 msg->msg[msg->len++] = audio_out_delay;
1676}1677}
1677 1678
1678static inline void cec_ops_report_current_latency(const struct cec_msg *msg,1679static inline void cec_ops_report_current_latency(const struct cec_msg *msg,
@@ -1686,7 +1687,10 @@ static inline void cec_ops_report_current_latency(const struct cec_msg *msg, · 7 unmodified lines
1686 *video_latency = msg->msg[4];1687 *video_latency = msg->msg[4];
1687 *low_latency_mode = (msg->msg[5] >> 2) & 1;1688 *low_latency_mode = (msg->msg[5] >> 2) & 1;
1688 *audio_out_compensated = msg->msg[5] & 3;1689 *audio_out_compensated = msg->msg[5] & 3;
1689 *audio_out_delay = msg->msg[6];1690 if (*audio_out_compensated == 3 && msg->len >= 7)
1691 *audio_out_delay = msg->msg[6];
1692 else
1693 *audio_out_delay = 0;
1690}1694}
1691 1695
1692static inline void cec_msg_request_current_latency(struct cec_msg *msg,1696static inline void cec_msg_request_current_latency(struct cec_msg *msg,
include/uapi/linux/netfilter/nf_log.h+2−0
@@ -9,4 +9,6 @@ · 8 unmodified lines
9#define NF_LOG_MACDECODE 0x20 /* Decode MAC header */9#define NF_LOG_MACDECODE 0x20 /* Decode MAC header */
10#define NF_LOG_MASK 0x2f10#define NF_LOG_MASK 0x2f
11 11
12#define NF_LOG_PREFIXLEN 128
13
12#endif /* _NETFILTER_NF_LOG_H */14#endif /* _NETFILTER_NF_LOG_H */
include/uapi/linux/netfilter/nf_tables.h+2−2
@@ -235,7 +235,7 @@ enum nft_rule_compat_flags { · 234 unmodified lines
235/**235/**
236 * enum nft_rule_compat_attributes - nf_tables rule compat attributes236 * enum nft_rule_compat_attributes - nf_tables rule compat attributes
237 *237 *
238 * @NFTA_RULE_COMPAT_PROTO: numerice value of handled protocol (NLA_U32)238 * @NFTA_RULE_COMPAT_PROTO: numeric value of handled protocol (NLA_U32)
239 * @NFTA_RULE_COMPAT_FLAGS: bitmask of enum nft_rule_compat_flags (NLA_U32)239 * @NFTA_RULE_COMPAT_FLAGS: bitmask of enum nft_rule_compat_flags (NLA_U32)
240 */240 */
241enum nft_rule_compat_attributes {241enum nft_rule_compat_attributes {
@@ -499,7 +499,7 @@ enum nft_bitwise_attributes { · 257 unmodified lines
499 * enum nft_byteorder_ops - nf_tables byteorder operators499 * enum nft_byteorder_ops - nf_tables byteorder operators
500 *500 *
501 * @NFT_BYTEORDER_NTOH: network to host operator501 * @NFT_BYTEORDER_NTOH: network to host operator
502 * @NFT_BYTEORDER_HTON: host to network opertaor502 * @NFT_BYTEORDER_HTON: host to network operator
503 */503 */
504enum nft_byteorder_ops {504enum nft_byteorder_ops {
505 NFT_BYTEORDER_NTOH,505 NFT_BYTEORDER_NTOH,