Commit 682ec859 authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller

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: default avatarPaolo Abeni <pabeni@redhat.com>
Acked-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d312d0a6
...@@ -5666,11 +5666,8 @@ void *skb_ext_add(struct sk_buff *skb, enum skb_ext_id id) ...@@ -5666,11 +5666,8 @@ void *skb_ext_add(struct sk_buff *skb, enum skb_ext_id id)
if (!new) if (!new)
return NULL; return NULL;
if (__skb_ext_exist(new, id)) { if (__skb_ext_exist(new, id))
if (old != new)
skb->extensions = new;
goto set_active; goto set_active;
}
newoff = new->chunks; newoff = new->chunks;
} else { } else {
...@@ -5684,8 +5681,8 @@ void *skb_ext_add(struct sk_buff *skb, enum skb_ext_id id) ...@@ -5684,8 +5681,8 @@ void *skb_ext_add(struct sk_buff *skb, enum skb_ext_id id)
newlen = newoff + skb_ext_type_len[id]; newlen = newoff + skb_ext_type_len[id];
new->chunks = newlen; new->chunks = newlen;
new->offset[id] = newoff; new->offset[id] = newoff;
skb->extensions = new;
set_active: set_active:
skb->extensions = new;
skb->active_extensions |= 1 << id; skb->active_extensions |= 1 << id;
return skb_ext_get_ptr(new, id); return skb_ext_get_ptr(new, id);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment