net/sched: Use fallthrough pseudo-keyword

GustavoARSilva · davem330 · commit 964201de695b · 2020-07-07T15:47:46.000-07:00
Replace the existing /* fall through */ comments and its variants with the new pseudo-keyword macro fallthrough[1]. Also, remove unnecessary fall-through markings when it is the case. [1] https://www.kernel.org/doc/html/latest/process/deprecated.html?highlight=fallthrough#implicit-switch-case-fall-through Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/sched/act_csum.c b/net/sched/act_csum.c
@@ -598,7 +598,8 @@ static int tcf_csum_act(struct sk_buff *skb, const struct tc_action *a,
 		if (!tcf_csum_ipv6(skb, update_flags))
 			goto drop;
 		break;
-	case cpu_to_be16(ETH_P_8021AD): /* fall through */
+	case cpu_to_be16(ETH_P_8021AD):
+		fallthrough;
 	case cpu_to_be16(ETH_P_8021Q):
 		if (skb_vlan_tag_present(skb) && !orig_vlan_tag_present) {
 			protocol = skb->protocol;
diff --git a/net/sched/act_ct.c b/net/sched/act_ct.c
@@ -783,7 +783,7 @@ static int ct_nat_execute(struct sk_buff *skb, struct nf_conn *ct,
 			}
 		}
 		/* Non-ICMP, fall thru to initialize if needed. */
-		/* fall through */
+		fallthrough;
 	case IP_CT_NEW:
 		/* Seen it before?  This can happen for loopback, retrans,
 		 * or local packets.
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
@@ -250,7 +250,7 @@ cbq_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr)
 		case TC_ACT_STOLEN:
 		case TC_ACT_TRAP:
 			*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
-			/* fall through */
+			fallthrough;
 		case TC_ACT_SHOT:
 			return NULL;
 		case TC_ACT_RECLASSIFY:
diff --git a/net/sched/sch_drr.c b/net/sched/sch_drr.c
@@ -324,7 +324,7 @@ static struct drr_class *drr_classify(struct sk_buff *skb, struct Qdisc *sch,
 		case TC_ACT_STOLEN:
 		case TC_ACT_TRAP:
 			*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
-			/* fall through */
+			fallthrough;
 		case TC_ACT_SHOT:
 			return NULL;
 		}
diff --git a/net/sched/sch_ets.c b/net/sched/sch_ets.c
@@ -397,7 +397,7 @@ static struct ets_class *ets_classify(struct sk_buff *skb, struct Qdisc *sch,
 		case TC_ACT_QUEUED:
 		case TC_ACT_TRAP:
 			*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
-			/* fall through */
+			fallthrough;
 		case TC_ACT_SHOT:
 			return NULL;
 		}
diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c
@@ -99,7 +99,7 @@ static unsigned int fq_codel_classify(struct sk_buff *skb, struct Qdisc *sch,
 		case TC_ACT_QUEUED:
 		case TC_ACT_TRAP:
 			*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
-			/* fall through */
+			fallthrough;
 		case TC_ACT_SHOT:
 			return 0;
 		}
diff --git a/net/sched/sch_fq_pie.c b/net/sched/sch_fq_pie.c
@@ -102,7 +102,7 @@ static unsigned int fq_pie_classify(struct sk_buff *skb, struct Qdisc *sch,
 		case TC_ACT_QUEUED:
 		case TC_ACT_TRAP:
 			*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
-			/* fall through */
+			fallthrough;
 		case TC_ACT_SHOT:
 			return 0;
 		}
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c
@@ -1136,7 +1136,7 @@ hfsc_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr)
 		case TC_ACT_STOLEN:
 		case TC_ACT_TRAP:
 			*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
-			/* fall through */
+			fallthrough;
 		case TC_ACT_SHOT:
 			return NULL;
 		}
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
@@ -239,7 +239,7 @@ static struct htb_class *htb_classify(struct sk_buff *skb, struct Qdisc *sch,
 		case TC_ACT_STOLEN:
 		case TC_ACT_TRAP:
 			*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
-			/* fall through */
+			fallthrough;
 		case TC_ACT_SHOT:
 			return NULL;
 		}
diff --git a/net/sched/sch_multiq.c b/net/sched/sch_multiq.c
@@ -43,7 +43,7 @@ multiq_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr)
 	case TC_ACT_QUEUED:
 	case TC_ACT_TRAP:
 		*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
-		/* fall through */
+		fallthrough;
 	case TC_ACT_SHOT:
 		return NULL;
 	}
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c
@@ -46,7 +46,7 @@ prio_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr)
 		case TC_ACT_QUEUED:
 		case TC_ACT_TRAP:
 			*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
-			/* fall through */
+			fallthrough;
 		case TC_ACT_SHOT:
 			return NULL;
 		}
diff --git a/net/sched/sch_qfq.c b/net/sched/sch_qfq.c
@@ -699,7 +699,7 @@ static struct qfq_class *qfq_classify(struct sk_buff *skb, struct Qdisc *sch,
 		case TC_ACT_STOLEN:
 		case TC_ACT_TRAP:
 			*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
-			/* fall through */
+			fallthrough;
 		case TC_ACT_SHOT:
 			return NULL;
 		}
diff --git a/net/sched/sch_sfb.c b/net/sched/sch_sfb.c
@@ -265,7 +265,7 @@ static bool sfb_classify(struct sk_buff *skb, struct tcf_proto *fl,
 		case TC_ACT_QUEUED:
 		case TC_ACT_TRAP:
 			*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
-			/* fall through */
+			fallthrough;
 		case TC_ACT_SHOT:
 			return false;
 		}
diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
@@ -186,7 +186,7 @@ static unsigned int sfq_classify(struct sk_buff *skb, struct Qdisc *sch,
 		case TC_ACT_QUEUED:
 		case TC_ACT_TRAP:
 			*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
-			/* fall through */
+			fallthrough;
 		case TC_ACT_SHOT:
 			return 0;
 		}

Original file line number	Diff line number	Diff line change
`@@ -783,7 +783,7 @@ static int ct_nat_execute(struct sk_buff skb, struct nf_conn ct,`
`783`	`783`	`}`
`784`	`784`	`}`
`785`	`785`	`/* Non-ICMP, fall thru to initialize if needed. */`
`786`		`- /* fall through */`
	`786`	`+ fallthrough;`
`787`	`787`	`case IP_CT_NEW:`
`788`	`788`	`/* Seen it before? This can happen for loopback, retrans,`
`789`	`789`	`* or local packets.`
Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ static struct drr_class drr_classify(struct sk_buff skb, struct Qdisc *sch,`
`324`	`324`	`case TC_ACT_STOLEN:`
`325`	`325`	`case TC_ACT_TRAP:`
`326`	`326`	`*qerr = NET_XMIT_SUCCESS \| __NET_XMIT_STOLEN;`
`327`		`- /* fall through */`
	`327`	`+ fallthrough;`
`328`	`328`	`case TC_ACT_SHOT:`
`329`	`329`	`return NULL;`
`330`	`330`	`}`
Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ static struct ets_class ets_classify(struct sk_buff skb, struct Qdisc *sch,`
`397`	`397`	`case TC_ACT_QUEUED:`
`398`	`398`	`case TC_ACT_TRAP:`
`399`	`399`	`*qerr = NET_XMIT_SUCCESS \| __NET_XMIT_STOLEN;`
`400`		`- /* fall through */`
	`400`	`+ fallthrough;`
`401`	`401`	`case TC_ACT_SHOT:`
`402`	`402`	`return NULL;`
`403`	`403`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ static unsigned int fq_codel_classify(struct sk_buff skb, struct Qdisc sch,`
`99`	`99`	`case TC_ACT_QUEUED:`
`100`	`100`	`case TC_ACT_TRAP:`
`101`	`101`	`*qerr = NET_XMIT_SUCCESS \| __NET_XMIT_STOLEN;`
`102`		`- /* fall through */`
	`102`	`+ fallthrough;`
`103`	`103`	`case TC_ACT_SHOT:`
`104`	`104`	`return 0;`
`105`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ static unsigned int fq_pie_classify(struct sk_buff skb, struct Qdisc sch,`
`102`	`102`	`case TC_ACT_QUEUED:`
`103`	`103`	`case TC_ACT_TRAP:`
`104`	`104`	`*qerr = NET_XMIT_SUCCESS \| __NET_XMIT_STOLEN;`
`105`		`- /* fall through */`
	`105`	`+ fallthrough;`
`106`	`106`	`case TC_ACT_SHOT:`
`107`	`107`	`return 0;`
`108`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1136,7 +1136,7 @@ hfsc_classify(struct sk_buff skb, struct Qdisc sch, int *qerr)`
`1136`	`1136`	`case TC_ACT_STOLEN:`
`1137`	`1137`	`case TC_ACT_TRAP:`
`1138`	`1138`	`*qerr = NET_XMIT_SUCCESS \| __NET_XMIT_STOLEN;`
`1139`		`- /* fall through */`
	`1139`	`+ fallthrough;`
`1140`	`1140`	`case TC_ACT_SHOT:`
`1141`	`1141`	`return NULL;`
`1142`	`1142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ static struct htb_class htb_classify(struct sk_buff skb, struct Qdisc *sch,`
`239`	`239`	`case TC_ACT_STOLEN:`
`240`	`240`	`case TC_ACT_TRAP:`
`241`	`241`	`*qerr = NET_XMIT_SUCCESS \| __NET_XMIT_STOLEN;`
`242`		`- /* fall through */`
	`242`	`+ fallthrough;`
`243`	`243`	`case TC_ACT_SHOT:`
`244`	`244`	`return NULL;`
`245`	`245`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ multiq_classify(struct sk_buff skb, struct Qdisc sch, int *qerr)`
`43`	`43`	`case TC_ACT_QUEUED:`
`44`	`44`	`case TC_ACT_TRAP:`
`45`	`45`	`*qerr = NET_XMIT_SUCCESS \| __NET_XMIT_STOLEN;`
`46`		`- /* fall through */`
	`46`	`+ fallthrough;`
`47`	`47`	`case TC_ACT_SHOT:`
`48`	`48`	`return NULL;`
`49`	`49`	`}`