diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-09-09 12:43:30 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-09-11 10:01:23 +0200 |
| commit | 556f86bbfd9cadf70ddb03755d70eeb8e5670260 (patch) | |
| tree | 6630be5e209c7a6f7291d4bb96e6f7a145589894 /target/linux | |
| parent | 2d257351f3538c65dfe5e42446f64db879fd8928 (diff) | |
| download | upstream-556f86bbfd9cadf70ddb03755d70eeb8e5670260.tar.gz upstream-556f86bbfd9cadf70ddb03755d70eeb8e5670260.tar.bz2 upstream-556f86bbfd9cadf70ddb03755d70eeb8e5670260.zip | |
kernel: bump 4.9 to 4.9.191
Refreshed all patches.
Compile-tested on: ar71xx
Runtime-tested on: ar71xx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux')
| -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 |