[PATCH v7 net-next 07/13] gtp: Use goto for exceptions in gtp_udp_encap_recv funcs

[Tom Herbert]

Consolidate return logic to make it easier to extend.

Signed-off-by: Tom Herbert <t...@quantonium.net>
---
 drivers/net/gtp.c | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c
index 265fa9fdbf3d..2daf434ae543 100644
--- a/drivers/net/gtp.c
+++ b/drivers/net/gtp.c
@@ -234,23 +234,27 @@ static int gtp0_udp_encap_recv(struct gtp_dev *gtp, 
struct sk_buff *skb)
        struct pdp_ctx *pctx;
 
        if (!pskb_may_pull(skb, hdrlen))
-               return -1;
+               goto drop;
 
        gtp0 = (struct gtp0_header *)(skb->data + sizeof(struct udphdr));
 
        if ((gtp0->flags >> 5) != GTP_V0)
-               return 1;
+               goto pass;
 
        if (gtp0->type != GTP_TPDU)
-               return 1;
+               goto pass;
 
        pctx = gtp0_pdp_find(gtp, be64_to_cpu(gtp0->tid));
        if (!pctx) {
                netdev_dbg(gtp->dev, "No PDP ctx to decap skb=%p\n", skb);
-               return 1;
+               goto pass;
        }
 
        return gtp_rx(pctx, skb, hdrlen, gtp->role);
+drop:
+       return -1;
+pass:
+       return 1;
 }
 
 static int gtp1u_udp_encap_recv(struct gtp_dev *gtp, struct sk_buff *skb)
@@ -261,15 +265,15 @@ static int gtp1u_udp_encap_recv(struct gtp_dev *gtp, 
struct sk_buff *skb)
        struct pdp_ctx *pctx;
 
        if (!pskb_may_pull(skb, hdrlen))
-               return -1;
+               goto drop;
 
        gtp1 = (struct gtp1_header *)(skb->data + sizeof(struct udphdr));
 
        if ((gtp1->flags >> 5) != GTP_V1)
-               return 1;
+               goto pass;
 
        if (gtp1->type != GTP_TPDU)
-               return 1;
+               goto pass;
 
        /* From 29.060: "This field shall be present if and only if any one or
         * more of the S, PN and E flags are set.".
@@ -282,17 +286,21 @@ static int gtp1u_udp_encap_recv(struct gtp_dev *gtp, 
struct sk_buff *skb)
 
        /* Make sure the header is larger enough, including extensions. */
        if (!pskb_may_pull(skb, hdrlen))
-               return -1;
+               goto drop;
 
        gtp1 = (struct gtp1_header *)(skb->data + sizeof(struct udphdr));
 
        pctx = gtp1_pdp_find(gtp, ntohl(gtp1->tid));
        if (!pctx) {
                netdev_dbg(gtp->dev, "No PDP ctx to decap skb=%p\n", skb);
-               return 1;
+               goto drop;
        }
 
        return gtp_rx(pctx, skb, hdrlen, gtp->role);
+drop:
+       return -1;
+pass:
+       return 1;
 }
 
 static void gtp_encap_destroy(struct sock *sk)
-- 
2.11.0