diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-09-09 13:21:20 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-09-11 09:47:49 +0200 |
| commit | 3b6b66529ff0e9c7dba6fd28972beda99b07b29e (patch) | |
| tree | da54ff3070f4a80d7da4a9110dbef6b69a88b159 /target/linux/generic/backport-4.9 | |
| parent | a858db313687ddfa6ed1ddba76bd74844a7b89dc (diff) | |
| download | upstream-3b6b66529ff0e9c7dba6fd28972beda99b07b29e.tar.gz upstream-3b6b66529ff0e9c7dba6fd28972beda99b07b29e.tar.bz2 upstream-3b6b66529ff0e9c7dba6fd28972beda99b07b29e.zip | |
kernel: bump 4.9 to 4.9.191
Refreshed all patches.
Compile-tested on: none
Runtime-tested on: none
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.9')
| -rw-r--r-- | target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch index 1d22216984..bef1e8692c 100644 --- a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch +++ b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch @@ -668,15 +668,15 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/drivers/net/ethernet/hisilicon/hip04_eth.c +++ b/drivers/net/ethernet/hisilicon/hip04_eth.c -@@ -555,7 +555,7 @@ refill: +@@ -559,7 +559,7 @@ refill: priv->reg_inten |= RCV_INT; writel_relaxed(priv->reg_inten, priv->base + PPE_INTEN); } - napi_complete(napi); + napi_complete_done(napi, rx); done: - /* clean up tx descriptors and start a new timer if necessary */ - tx_remaining = hip04_tx_reclaim(ndev, false); + /* start a new timer if necessary */ + if (rx < budget && tx_remaining) --- a/drivers/net/ethernet/hisilicon/hisi_femac.c +++ b/drivers/net/ethernet/hisilicon/hisi_femac.c @@ -330,7 +330,7 @@ static int hisi_femac_poll(struct napi_s |