From: Junwei Zhang <martinbj2...@gmail.com>
the permanent protocol nodes are at the head of the list.
So only need check all these nodes.
and insert the new node after the last permanent protocol node,
no matter new node is permanent or not.
If the inserted proto conflicts with existing permanent protocol,
then goto out_permanent immediately.
Signed-off-by: Martin Zhang <martinbj2...@gmail.com>
---
net/ipv4/af_inet.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 1d0c3ad..c61e0b5 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1043,22 +1043,16 @@ void inet_register_protosw(struct inet_protosw *p)
goto out_illegal;
/* If we are trying to override a permanent protocol, bail. */
- answer = NULL;
last_perm = &inetsw[p->type];
list_for_each(lh, &inetsw[p->type]) {
answer = list_entry(lh, struct inet_protosw, list);
-
/* Check only the non-wild match. */
- if (INET_PROTOSW_PERMANENT & answer->flags) {
- if (protocol == answer->protocol)
+ if ((INET_PROTOSW_PERMANENT & answer->flags) == 0)
break;
- last_perm = lh;
- }
-
- answer = NULL;
+ if (protocol == answer->protocol)
+ goto out_permanent;
+ last_perm = lh;
}
- if (answer)
- goto out_permanent;
/* Add the new entry after the last permanent entry if any, so that
* the new entry does not override a permanent entry when matched with
--
1.8.3.1
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
