projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
20b1e16
)
net: mvpp2: Rename a jump label in mvpp2_prs_double_vlan_add()
author
Markus Elfring
<
[email protected]
>
Mon, 17 Apr 2017 11:03:49 +0000
(13:03 +0200)
committer
David S. Miller
<
[email protected]
>
Tue, 18 Apr 2017 17:55:09 +0000
(13:55 -0400)
Adjust jump labels according to the Linux coding style convention.
Signed-off-by: Markus Elfring <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/marvell/mvpp2.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/marvell/mvpp2.c
b/drivers/net/ethernet/marvell/mvpp2.c
index a5cd1036012af4f24abb4bd218cac3eb4af75907..0c190bd003b1fdca761cb8be047d00e915b9bd6d 100644
(file)
--- a/
drivers/net/ethernet/marvell/mvpp2.c
+++ b/
drivers/net/ethernet/marvell/mvpp2.c
@@
-2139,7
+2139,7
@@
static int mvpp2_prs_double_vlan_add(struct mvpp2 *priv, unsigned short tpid1,
ai = mvpp2_prs_double_vlan_ai_free_get(priv);
if (ai < 0) {
ret = ai;
- goto
error
;
+ goto
free_pe
;
}
/* Get first single/triple vlan tid */
@@
-2162,7
+2162,7
@@
static int mvpp2_prs_double_vlan_add(struct mvpp2 *priv, unsigned short tpid1,
if (tid >= tid_aux) {
ret = -ERANGE;
- goto
error
;
+ goto
free_pe
;
}
memset(pe, 0, sizeof(*pe));
@@
-2189,8
+2189,7
@@
static int mvpp2_prs_double_vlan_add(struct mvpp2 *priv, unsigned short tpid1,
/* Update ports' mask */
mvpp2_prs_tcam_port_map_set(pe, port_map);
mvpp2_prs_hw_write(priv, pe);
-
-error:
+free_pe:
kfree(pe);
return ret;
}