2014-07-14 16:35:43

by Fabian Frédérick

[permalink] [raw]
Subject: [PATCH 10/16] netfilter: remove unnecessary break after return

Signed-off-by: Fabian Frederick <[email protected]>
---
net/ipv6/netfilter/ip6t_ipv6header.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/net/ipv6/netfilter/ip6t_ipv6header.c b/net/ipv6/netfilter/ip6t_ipv6header.c
index 54bd979..8b14744 100644
--- a/net/ipv6/netfilter/ip6t_ipv6header.c
+++ b/net/ipv6/netfilter/ip6t_ipv6header.c
@@ -94,7 +94,6 @@ ipv6header_mt6(const struct sk_buff *skb, struct xt_action_param *par)
break;
default:
return false;
- break;
}

nexthdr = hp->nexthdr;
--
1.8.4.5


2014-07-14 16:36:05

by Fabian Frédérick

[permalink] [raw]
Subject: [PATCH 14/16] irda: remove unnecessary break after return

Signed-off-by: Fabian Frederick <[email protected]>
---
net/irda/af_irda.c | 1 -
net/irda/irlan/irlan_common.c | 1 -
2 files changed, 2 deletions(-)

diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index 54747c2..92fafd4 100644
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -674,7 +674,6 @@ static int irda_discover_daddr_and_lsap_sel(struct irda_sock *self, char *name)
self->daddr = DEV_ADDR_ANY;
kfree(discoveries);
return -EHOSTUNREACH;
- break;
}
}
/* Cleanup our copy of the discovery log */
diff --git a/net/irda/irlan/irlan_common.c b/net/irda/irlan/irlan_common.c
index 7ac4d1b..1bc49ed 100644
--- a/net/irda/irlan/irlan_common.c
+++ b/net/irda/irlan/irlan_common.c
@@ -1024,7 +1024,6 @@ static int __irlan_insert_param(struct sk_buff *skb, char *param, int type,
default:
IRDA_DEBUG(2, "%s(), Unknown parameter type!\n", __func__ );
return 0;
- break;
}

/* Insert at end of sk-buffer */
--
1.8.4.5

2014-07-14 16:35:54

by Fabian Frédérick

[permalink] [raw]
Subject: [PATCH 12/16] NFC: remove unnecessary break after goto

Signed-off-by: Fabian Frederick <[email protected]>
---
net/nfc/digital_dep.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/net/nfc/digital_dep.c b/net/nfc/digital_dep.c
index 171cb99..37deb17 100644
--- a/net/nfc/digital_dep.c
+++ b/net/nfc/digital_dep.c
@@ -457,12 +457,10 @@ static void digital_tg_recv_dep_req(struct nfc_digital_dev *ddev, void *arg,
pr_err("Received a ACK/NACK PDU\n");
rc = -EINVAL;
goto exit;
- break;
case DIGITAL_NFC_DEP_PFB_SUPERVISOR_PDU:
pr_err("Received a SUPERVISOR PDU\n");
rc = -EINVAL;
goto exit;
- break;
}

skb_pull(resp, size);
--
1.8.4.5

2014-07-14 16:36:27

by Fabian Frédérick

[permalink] [raw]
Subject: [PATCH 16/16] net: sctp: remove unnecessary break after return/goto

Signed-off-by: Fabian Frederick <[email protected]>
---
net/sctp/outqueue.c | 1 -
net/sctp/sm_statefuns.c | 4 ----
2 files changed, 5 deletions(-)

diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
index 9c77947..d31435e 100644
--- a/net/sctp/outqueue.c
+++ b/net/sctp/outqueue.c
@@ -1025,7 +1025,6 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout)

sctp_outq_head_data(q, chunk);
goto sctp_flush_out;
- break;

case SCTP_XMIT_OK:
/* The sender is in the SHUTDOWN-PENDING state,
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 5170a1f..d3f1ea4 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -4182,7 +4182,6 @@ sctp_disposition_t sctp_sf_unk_chunk(struct net *net,
case SCTP_CID_ACTION_DISCARD:
/* Discard the packet. */
return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);
- break;
case SCTP_CID_ACTION_DISCARD_ERR:
/* Generate an ERROR chunk as response. */
hdr = unk_chunk->chunk_hdr;
@@ -4198,11 +4197,9 @@ sctp_disposition_t sctp_sf_unk_chunk(struct net *net,
/* Discard the packet. */
sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);
return SCTP_DISPOSITION_CONSUME;
- break;
case SCTP_CID_ACTION_SKIP:
/* Skip the chunk. */
return SCTP_DISPOSITION_DISCARD;
- break;
case SCTP_CID_ACTION_SKIP_ERR:
/* Generate an ERROR chunk as response. */
hdr = unk_chunk->chunk_hdr;
@@ -4216,7 +4213,6 @@ sctp_disposition_t sctp_sf_unk_chunk(struct net *net,
}
/* Skip the chunk. */
return SCTP_DISPOSITION_CONSUME;
- break;
default:
break;
}
--
1.8.4.5

2014-07-14 16:36:50

by Fabian Frédérick

[permalink] [raw]
Subject: [PATCH 15/16] ieee802154: remove unnecessary break after goto

Signed-off-by: Fabian Frederick <[email protected]>
---
net/ieee802154/6lowpan_iphc.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/net/ieee802154/6lowpan_iphc.c b/net/ieee802154/6lowpan_iphc.c
index 211b568..11aa235 100644
--- a/net/ieee802154/6lowpan_iphc.c
+++ b/net/ieee802154/6lowpan_iphc.c
@@ -300,7 +300,6 @@ uncompress_udp_header(struct sk_buff *skb, struct udphdr *uh)
default:
pr_debug("ERROR: unknown UDP format\n");
goto err;
- break;
}

pr_debug("uncompressed UDP ports: src = %d, dst = %d\n",
--
1.8.4.5

2014-07-14 16:37:12

by Fabian Frédérick

[permalink] [raw]
Subject: [PATCH 13/16] caif: remove unnecessary break after goto

Signed-off-by: Fabian Frederick <[email protected]>
---
net/caif/cfctrl.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
index 0f45522..f5afda1 100644
--- a/net/caif/cfctrl.c
+++ b/net/caif/cfctrl.c
@@ -547,7 +547,6 @@ static int cfctrl_recv(struct cflayer *layer, struct cfpkt *pkt)
default:
pr_err("Unrecognized Control Frame\n");
goto error;
- break;
}
ret = 0;
error:
--
1.8.4.5

2014-07-14 16:37:33

by Fabian Frédérick

[permalink] [raw]
Subject: [PATCH 11/16] ipv6: remove unnecessary break after return

Signed-off-by: Fabian Frederick <[email protected]>
---
net/ipv6/ipv6_sockglue.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index edb58af..7666cfe 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -1158,7 +1158,6 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
return -EFAULT;

return 0;
- break;
}

case IPV6_TRANSPARENT:
--
1.8.4.5