diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2018-12-21 19:03:15 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-12-21 10:24:54 -0800 |
| commit | 682ec859518d73435cc924d816da2953343241c1 (patch) | |
| tree | 11fb43824d249c87afe417bef0b9c372077972b4 | |
| parent | d312d0a6846a4553bd955afd414f8f55398ece07 (diff) | |
| download | lwn-682ec859518d73435cc924d816da2953343241c1.tar.gz lwn-682ec859518d73435cc924d816da2953343241c1.zip | |
net: minor cleanup in skb_ext_add()
When the extension to be added is already present, the only
skb field we may need to update is 'extensions': we can reorder
the code and avoid a branch.
v1 -> v2:
- be sure to flag the newly added extension as active
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Acked-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/skbuff.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index e1d88762f659..37317ffec146 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -5666,11 +5666,8 @@ void *skb_ext_add(struct sk_buff *skb, enum skb_ext_id id) if (!new) return NULL; - if (__skb_ext_exist(new, id)) { - if (old != new) - skb->extensions = new; + if (__skb_ext_exist(new, id)) goto set_active; - } newoff = new->chunks; } else { @@ -5684,8 +5681,8 @@ void *skb_ext_add(struct sk_buff *skb, enum skb_ext_id id) newlen = newoff + skb_ext_type_len[id]; new->chunks = newlen; new->offset[id] = newoff; - skb->extensions = new; set_active: + skb->extensions = new; skb->active_extensions |= 1 << id; return skb_ext_get_ptr(new, id); } |