mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-06 19:08:57 +09:00
Merge tag 'v6.6.55' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroid-6.6.y
This is the 6.6.55 stable release Change-Id: I94d36af1895dd46eaf12a0cb0e2c46c1cb532a9b
This commit is contained in:
@@ -132,6 +132,8 @@ static inline void cec_msg_init(struct cec_msg *msg,
|
||||
* Set the msg destination to the orig initiator and the msg initiator to the
|
||||
* orig destination. Note that msg and orig may be the same pointer, in which
|
||||
* case the change is done in place.
|
||||
*
|
||||
* It also zeroes the reply, timeout and flags fields.
|
||||
*/
|
||||
static inline void cec_msg_set_reply_to(struct cec_msg *msg,
|
||||
struct cec_msg *orig)
|
||||
@@ -139,7 +141,9 @@ static inline void cec_msg_set_reply_to(struct cec_msg *msg,
|
||||
/* The destination becomes the initiator and vice versa */
|
||||
msg->msg[0] = (cec_msg_destination(orig) << 4) |
|
||||
cec_msg_initiator(orig);
|
||||
msg->reply = msg->timeout = 0;
|
||||
msg->reply = 0;
|
||||
msg->timeout = 0;
|
||||
msg->flags = 0;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -1690,7 +1690,7 @@ enum nft_flowtable_flags {
|
||||
*
|
||||
* @NFTA_FLOWTABLE_TABLE: name of the table containing the expression (NLA_STRING)
|
||||
* @NFTA_FLOWTABLE_NAME: name of this flow table (NLA_STRING)
|
||||
* @NFTA_FLOWTABLE_HOOK: netfilter hook configuration(NLA_U32)
|
||||
* @NFTA_FLOWTABLE_HOOK: netfilter hook configuration (NLA_NESTED)
|
||||
* @NFTA_FLOWTABLE_USE: number of references to this flow table (NLA_U32)
|
||||
* @NFTA_FLOWTABLE_HANDLE: object handle (NLA_U64)
|
||||
* @NFTA_FLOWTABLE_FLAGS: flags (NLA_U32)
|
||||
|
||||
Reference in New Issue
Block a user