diff options
| author | David S. Miller <davem@davemloft.net> | 2021-02-16 17:30:20 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-02-16 17:51:13 -0800 |
| commit | d489ded1a3690d7eca8633575cba3f7dac8484c7 (patch) | |
| tree | 20e739382965ac61d6314e6b0df4cb6acbbbca0e /include | |
| parent | 86dd9868b8788a9063893a97649594af93cd5aa6 (diff) | |
| parent | 3af409ca278d4a8d50e91f9f7c4c33b175645cf3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/atmdev.h | 2 | ||||
| -rw-r--r-- | include/net/act_api.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/pkt_cls.h | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h index d7493016cd46..60cd25c0461b 100644 --- a/include/linux/atmdev.h +++ b/include/linux/atmdev.h @@ -207,7 +207,7 @@ struct atm_skb_data { struct atm_vcc *vcc; /* ATM VCC */ unsigned long atm_options; /* ATM layer options */ unsigned int acct_truesize; /* truesize accounted to vcc */ -}; +} __packed; #define VCC_HTABLE_SIZE 32 diff --git a/include/net/act_api.h b/include/net/act_api.h index 761c0e331915..2bf3092ae7ec 100644 --- a/include/net/act_api.h +++ b/include/net/act_api.h @@ -166,6 +166,7 @@ int tcf_idr_create_from_flags(struct tc_action_net *tn, u32 index, struct nlattr *est, struct tc_action **a, const struct tc_action_ops *ops, int bind, u32 flags); +void tcf_idr_insert_many(struct tc_action *actions[]); void tcf_idr_cleanup(struct tc_action_net *tn, u32 index); int tcf_idr_check_alloc(struct tc_action_net *tn, u32 *index, struct tc_action **a, int bind); diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h index afe6836e44b1..7ea59cfe1fa7 100644 --- a/include/uapi/linux/pkt_cls.h +++ b/include/uapi/linux/pkt_cls.h @@ -593,6 +593,7 @@ enum { TCA_FLOWER_KEY_CT_FLAGS_TRACKED = 1 << 3, /* Conntrack has occurred. */ TCA_FLOWER_KEY_CT_FLAGS_INVALID = 1 << 4, /* Conntrack is invalid. */ TCA_FLOWER_KEY_CT_FLAGS_REPLY = 1 << 5, /* Packet is in the reply direction. */ + __TCA_FLOWER_KEY_CT_FLAGS_MAX, }; enum { |