Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfde3398 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-break-after-goto' 



Fabian Frederick says:

====================
net: remove unnecessary break after goto/return

Small patchset addressing break redundancy on net branch
(suggested by Joe Perches).
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7cf66041 138ce910

net/9p/client.c

+0 −1
Original line number Diff line number Diff line
@@ -959,7 +959,6 @@ static int p9_client_version(struct p9_client *c) 
		break;

	default:

		return -EINVAL;

		break;

	}



	if (IS_ERR(req))

net/caif/cfctrl.c

+0 −1
Original line number Diff line number Diff line
@@ -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:

net/core/drop_monitor.c

+0 −2
Original line number Diff line number Diff line
@@ -289,10 +289,8 @@ static int net_dm_cmd_trace(struct sk_buff *skb, 
	switch (info->genlhdr->cmd) {

	case NET_DM_CMD_START:

		return set_all_monitor_traces(TRACE_ON);

		break;

	case NET_DM_CMD_STOP:

		return set_all_monitor_traces(TRACE_OFF);

		break;

	}



	return -ENOTSUPP;

net/core/pktgen.c

+0 −1
Original line number Diff line number Diff line
@@ -804,7 +804,6 @@ static int strn_len(const char __user * user_buffer, unsigned int maxlen) 
		case '\t':

		case ' ':

			goto done_str;

			break;

		default:

			break;

		}

net/ieee802154/6lowpan_iphc.c

+0 −1
Original line number Diff line number Diff line
@@ -297,7 +297,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",