diff options
| author | David S. Miller <davem@davemloft.net> | 2018-12-21 21:24:54 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-12-21 21:24:54 +0300 |
| commit | 64935310f2fc0128373bbbcfb5b8b49fd26e2ae8 (patch) | |
| tree | 11fb43824d249c87afe417bef0b9c372077972b4 /include/linux | |
| parent | 7fa4bd739fc0fa209fa5120383aab17f6e9600f7 (diff) | |
| parent | 682ec859518d73435cc924d816da2953343241c1 (diff) | |
| download | linux-64935310f2fc0128373bbbcfb5b8b49fd26e2ae8.tar.xz | |
Merge branch 'skb_ext-fixes'
Paolo Abeni says:
====================
net: skb extension follow-ups
This series includes some follow-up for the recently added skb extension.
The first patch addresses an unlikely race while adding skb extensions,
and the following two are just minor code clean-up.
v1 -> v2:
- be sure to flag the newly added extension as active in skb_ext_add()
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/skbuff.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 3f741b04e55d..2a57a365c711 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -3938,16 +3938,6 @@ static inline void skb_ext_put(struct sk_buff *skb) __skb_ext_put(skb->extensions); } -static inline void skb_ext_get(struct sk_buff *skb) -{ - if (skb->active_extensions) { - struct skb_ext *ext = skb->extensions; - - if (ext) - refcount_inc(&ext->refcnt); - } -} - static inline void __skb_ext_copy(struct sk_buff *dst, const struct sk_buff *src) { @@ -3995,7 +3985,6 @@ static inline void *skb_ext_find(const struct sk_buff *skb, enum skb_ext_id id) } #else static inline void skb_ext_put(struct sk_buff *skb) {} -static inline void skb_ext_get(struct sk_buff *skb) {} static inline void skb_ext_del(struct sk_buff *skb, int unused) {} static inline void __skb_ext_copy(struct sk_buff *d, const struct sk_buff *s) {} static inline void skb_ext_copy(struct sk_buff *dst, const struct sk_buff *s) {} |