From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 11 Jan 2020 08:39:09 +0000 (+0100)
Subject: fix up some 4.14 networking patches to build properly
X-Git-Tag: v4.4.209~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2c71e4a315d9b69910d29b148dbe4b9fc09b6b8;p=thirdparty%2Fkernel%2Fstable-queue.git

fix up some 4.14 networking patches to build properly
---

diff --git a/queue-4.14/net-sch_prio-when-ungrafting-replace-with-fifo.patch b/queue-4.14/net-sch_prio-when-ungrafting-replace-with-fifo.patch
index 7202b8eeefd..579503ab74c 100644
--- a/queue-4.14/net-sch_prio-when-ungrafting-replace-with-fifo.patch
+++ b/queue-4.14/net-sch_prio-when-ungrafting-replace-with-fifo.patch
@@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -		new = &noop_qdisc;
 +	if (!new) {
 +		new = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops,
-+					TC_H_MAKE(sch->handle, arg), extack);
++					TC_H_MAKE(sch->handle, arg));
 +		if (!new)
 +			new = &noop_qdisc;
 +		else
diff --git a/queue-4.14/pkt_sched-fq-do-not-accept-silly-tca_fq_quantum.patch b/queue-4.14/pkt_sched-fq-do-not-accept-silly-tca_fq_quantum.patch
index 8049d83d956..afb8864405c 100644
--- a/queue-4.14/pkt_sched-fq-do-not-accept-silly-tca_fq_quantum.patch
+++ b/queue-4.14/pkt_sched-fq-do-not-accept-silly-tca_fq_quantum.patch
@@ -30,23 +30,17 @@ Reported-by: syzbot+dc9071cc5a85950bdfce@syzkaller.appspotmail.com
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- net/sched/sch_fq.c |    6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
+ net/sched/sch_fq.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 --- a/net/sched/sch_fq.c
 +++ b/net/sched/sch_fq.c
-@@ -734,10 +734,12 @@ static int fq_change(struct Qdisc *sch,
+@@ -734,7 +734,7 @@ static int fq_change(struct Qdisc *sch,
  	if (tb[TCA_FQ_QUANTUM]) {
  		u32 quantum = nla_get_u32(tb[TCA_FQ_QUANTUM]);
  
 -		if (quantum > 0)
-+		if (quantum > 0 && quantum <= (1 << 20)) {
++		if (quantum > 0 && quantum <= (1 << 20))
  			q->quantum = quantum;
--		else
-+		} else {
-+			NL_SET_ERR_MSG_MOD(extack, "invalid quantum");
+ 		else
  			err = -EINVAL;
-+		}
- 	}
- 
- 	if (tb[TCA_FQ_INITIAL_QUANTUM])