diff options
| author | Joel Stanley <joel@jms.id.au> | 2022-04-27 11:56:32 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2022-04-27 11:56:35 +0300 |
| commit | 85595a78a523118d962c625b21dce270210244a9 (patch) | |
| tree | 0c1c76226e44cc5e9b1139a706ccd6b717d88155 /include/net | |
| parent | fc8ba762618d0f80130ea68853692c52402d0b36 (diff) | |
| parent | 81d8d30c35edf29c5c70186ccb14dac4a5ca38a8 (diff) | |
| download | linux-85595a78a523118d962c625b21dce270210244a9.tar.xz | |
Merge tag 'v5.15.35' into dev-5.15
This is the 5.15.35 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ax25.h | 12 | ||||
| -rw-r--r-- | include/net/flow_dissector.h | 2 |
2 files changed, 14 insertions, 0 deletions
diff --git a/include/net/ax25.h b/include/net/ax25.h index 8b7eb46ad72d..aadff553e4b7 100644 --- a/include/net/ax25.h +++ b/include/net/ax25.h @@ -236,6 +236,7 @@ typedef struct ax25_dev { #if defined(CONFIG_AX25_DAMA_SLAVE) || defined(CONFIG_AX25_DAMA_MASTER) ax25_dama_info dama; #endif + refcount_t refcount; } ax25_dev; typedef struct ax25_cb { @@ -290,6 +291,17 @@ static __inline__ void ax25_cb_put(ax25_cb *ax25) } } +static inline void ax25_dev_hold(ax25_dev *ax25_dev) +{ + refcount_inc(&ax25_dev->refcount); +} + +static inline void ax25_dev_put(ax25_dev *ax25_dev) +{ + if (refcount_dec_and_test(&ax25_dev->refcount)) { + kfree(ax25_dev); + } +} static inline __be16 ax25_type_trans(struct sk_buff *skb, struct net_device *dev) { skb->dev = dev; diff --git a/include/net/flow_dissector.h b/include/net/flow_dissector.h index ffd386ea0dbb..c8d1c5e187e4 100644 --- a/include/net/flow_dissector.h +++ b/include/net/flow_dissector.h @@ -59,6 +59,8 @@ struct flow_dissector_key_vlan { __be16 vlan_tci; }; __be16 vlan_tpid; + __be16 vlan_eth_type; + u16 padding; }; struct flow_dissector_mpls_lse { |