* [PATCH] net: tulip: rearrange order of searching for substrings
@ 2015-06-03 11:44 Rasmus Villemoes
2015-06-04 3:21 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Rasmus Villemoes @ 2015-06-03 11:44 UTC (permalink / raw)
To: Grant Grundler; +Cc: Rasmus Villemoes, netdev, linux-kernel
Currently, two of the branches are dead code, since an earlier smaller
substring would have been found ("TP" in the "TP_NW" case and either
of "BNC" and "AUI" in the "BNC_AUI" case). Rearrange the strstr()
calls so that the longer strings are searched for first.
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
---
This is rather old code; presumably nobody ever noticed or cared. So
alternatively the dead branches can just be deleted.
drivers/net/ethernet/dec/tulip/de4x5.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
index badff181e719..8966f3159bb2 100644
--- a/drivers/net/ethernet/dec/tulip/de4x5.c
+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
@@ -5189,16 +5189,16 @@ de4x5_parse_params(struct net_device *dev)
if (strstr(p, "fdx") || strstr(p, "FDX")) lp->params.fdx = true;
if (strstr(p, "autosense") || strstr(p, "AUTOSENSE")) {
- if (strstr(p, "TP")) {
- lp->params.autosense = TP;
- } else if (strstr(p, "TP_NW")) {
+ if (strstr(p, "TP_NW")) {
lp->params.autosense = TP_NW;
+ } else if (strstr(p, "TP")) {
+ lp->params.autosense = TP;
+ } else if (strstr(p, "BNC_AUI")) {
+ lp->params.autosense = BNC;
} else if (strstr(p, "BNC")) {
lp->params.autosense = BNC;
} else if (strstr(p, "AUI")) {
lp->params.autosense = AUI;
- } else if (strstr(p, "BNC_AUI")) {
- lp->params.autosense = BNC;
} else if (strstr(p, "10Mb")) {
lp->params.autosense = _10Mb;
} else if (strstr(p, "100Mb")) {
--
2.1.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] net: tulip: rearrange order of searching for substrings
2015-06-03 11:44 [PATCH] net: tulip: rearrange order of searching for substrings Rasmus Villemoes
@ 2015-06-04 3:21 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2015-06-04 3:21 UTC (permalink / raw)
To: linux; +Cc: grundler, netdev, linux-kernel
From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Date: Wed, 3 Jun 2015 13:44:03 +0200
> Currently, two of the branches are dead code, since an earlier smaller
> substring would have been found ("TP" in the "TP_NW" case and either
> of "BNC" and "AUI" in the "BNC_AUI" case). Rearrange the strstr()
> calls so that the longer strings are searched for first.
>
> Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Applied to net-next, thank you.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-06-04 3:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-03 11:44 [PATCH] net: tulip: rearrange order of searching for substrings Rasmus Villemoes
2015-06-04 3:21 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.