--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -7682,18 +7682,8 @@ static int __napi_poll(struct napi_struct *n, bool *repoll)
 		netdev_err_once(n->dev, "NAPI poll function %pS returned %d, exceeding its budget of %d.\n",
 				n->poll, work, weight);
 +	if (likely(work < weight)) {
+		/* traffic is low, decrease weight for next time */
+		if (work < (weight / 2) && weight > 16)
+			n->weight = max(weight / 2, 16);
+		return work;
+	}
+
+	/* If we got here, work == weight, which means high traffic.
+	 * Increase weight for next time.
+	 */
+	if (n->weight < (NAPI_POLL_WEIGHT * 4))
+		n->weight = min(n->weight * 2, NAPI_POLL_WEIGHT * 4); 
-	if (likely(work < weight)) 		return work;
 	/* Drivers must not modify the NAPI state if they
 	 * consume the entire weight.  In such cases this code@@ -11432,7 +11422,6 @@ int register_netdevice(struct net_device *dev)
 	dev_init_scheduler(dev);.io/
 
 	netdev_hold(dev, &dev->dev_registered_tracker, GFP_KERNEL);+ 	list_netdevice(dev);
 
 	add_device_randomness(dev->dev_addr, dev->addr_len);diff --git a/net/ipv4/tcp_bbr.c b/net/ipv4/tcp_bbr.c
index cecfe6b81..760941e55 100644--- a/net/ipv4/tcp_bbr.c+++ b/net/ipv4/tcp_bbr.c@@ -77,11 +77,6 @@
 #define BBR_SCALE 8	/* scaling factor for fractions in BBR (e.g. gains) */
 #define BBR_UNIT (1 << BBR_SCALE)
 +/* TWEAK: Bandwidth delta parameters for pacing reduction */
+#define BW_DELTA_ALPHA		(BBR_UNIT / 2)	/* Rate of change for pacing */
+#define BW_DELTA_CEILING	(BBR_UNIT / 4)	/* Max reduction factor */
+#define BW_DELTA_FLOOR		(BBR_UNIT * 3 / 4)	/* Min pacing gain */
- /* BBR has the following modes for deciding how fast to send: */
 enum bbr_mode {
 	BBR_STARTUP,	/* ramp up sending rate rapidly to fill pipe */@@ -129,8 +124,7 @@ struct bbr {
 	u32	ack_epoch_acked:20,	/* packets (S)ACKed in sampling epoch */
 		extra_acked_win_rtts:5,	/* age of extra_acked, in round trips */
 		extra_acked_win_idx:1,	/* current index in extra_acked array */+		reduce_cwnd:1,		/* TWEAK: reduce cwnd after pacing drop */
+		unused_c:5;-		unused_c:6; };
 
 #define CYCLE_LEN	8	/* number of phases in a pacing gain cycle */@@ -532,12 +526,6 @@ static void bbr_set_cwnd(struct sock *sk, const struct rate_sample *rs,
 	if (!acked)
 		goto done;  /* no packet fully ACKed; just apply caps */
 +	/* TWEAK: Reduce cwnd if pacing gain dropped significantly */
+	if (bbr->reduce_cwnd) {
+		cwnd = max_t(s32, cwnd - acked, 1);
+		bbr->reduce_cwnd = 0; /* Consume flag */
+	}
- 	if (bbr_set_cwnd_to_recover_or_restore(sk, rs, acked, &cwnd))
 		goto done;
 @@ -775,7 +763,6 @@ static void bbr_update_bw(struct sock *sk, const struct rate_sample *rs)
 	struct tcp_sock *tp = tcp_sk(sk);
 	struct bbr *bbr = inet_csk_ca(sk);
 	u64 bw;+	u64 old_bw = bbr_bw(sk); /* TWEAK: Scrape old BW */ 
 	bbr->round_start = 0;
 	if (rs->delivered < 0 || rs->interval_us <= 0)@@ -791,6 +778,10 @@ static void bbr_update_bw(struct sock *sk, const struct rate_sample *rs)
 
 	bbr_lt_bw_sampling(sk, rs);
 -	/* Divide delivered by the interval to find a (lower bound) bottleneck
-	 * bandwidth sample. Delivered is in packets and interval_us in uS and
-	 * ratio will be <<1 for most connections. So delivered is first scaled.
-	 */ 	bw = div64_long((u64)rs->delivered * BW_UNIT, rs->interval_us);
 
 	/* If this sample is application-limited, it is likely to have a very@@ -799,40 +790,15 @@ static void bbr_update_bw(struct sock *sk, const struct rate_sample *rs)
 	 * bw, causing needless slow-down. Thus, to continue to send at the
 	 * last measured network rate, we filter out app-limited samples unless
 	 * they describe the path bw at least as well as our bw model.-	 *
-	 * So the goal during app-limited phase is to proceed with the best
-	 * network rate no matter how long. We automatically leave this
-	 * phase when app writes faster than the network can deliver :) 	 */
 	if (!rs->is_app_limited || bw >= bbr_max_bw(sk)) {
 		/* Incorporate new sample into our max bw filter. */
 		minmax_running_max(&bbr->bw, bbr_bw_rtts, bbr->rtt_cnt, bw);
 	}+
+	/* START TWEAK: Pacing reduction on bandwidth drop */
+	do {
+		u64 max_bw = bbr_max_bw(sk);
+		u64 delta, pacing_factor;
+
+		if (!max_bw || bw >= old_bw)
+			break;
+
+		/* Calculate reduction factor based on bandwidth drop */
+		delta = ((old_bw - bw) * BBR_UNIT) / max_bw;
+		pacing_factor = (delta * BW_DELTA_ALPHA) >> BBR_SCALE;
+
+		if (pacing_factor > BW_DELTA_CEILING)
+			pacing_factor = BW_DELTA_CEILING;
+
+		/* Apply the factor to the current pacing_gain */
+		if (pacing_factor < BBR_UNIT)
+			bbr->pacing_gain = (bbr->pacing_gain * (BBR_UNIT - pacing_factor)) >> BBR_SCALE;
+
+		bbr->reduce_cwnd = 0;
+		if (bbr->pacing_gain < BW_DELTA_FLOOR) {
+			bbr->reduce_cwnd = 1;
+			/* Don't let pacing gain get too low */
+			if (bbr->pacing_gain < BBR_UNIT / 8)
+				bbr->pacing_gain = BBR_UNIT / 8;
+		}
+	} while (0);
+	/* END TWEAK */ }