diff options
| author | Stijn Segers <foss@volatilesystems.org> | 2018-06-05 23:29:30 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2018-06-07 09:03:05 +0200 |
| commit | 6f8eb1b50fd8549524de3be3c540fe917b102393 (patch) | |
| tree | dd7f76b2c918e46df7acb22be73f8a094d1ab40e /target/linux/generic/backport-4.9/071-v4.10-0001-net-bgmac-allocate-struct-bgmac-just-once-don-t-copy.patch | |
| parent | 805e59cdcc2b6b2bb3f7583d8ccdb932e6cdeb7b (diff) | |
| download | upstream-6f8eb1b50fd8549524de3be3c540fe917b102393.tar.gz upstream-6f8eb1b50fd8549524de3be3c540fe917b102393.tar.bz2 upstream-6f8eb1b50fd8549524de3be3c540fe917b102393.zip | |
kernel: bump 4.9 to 4.9.106 for 18.06
Refreshed patches. The following patches were upstreamed and have been deleted:
* target/linux/ar71xx/patches-4.9/106-01-MIPS-ath79-fix-AR724X_PLL_REG_PCIE_CONFIG-offset.patch
* target/linux/generic/pending-4.9/180-net-phy-at803x-add-support-for-AT8032.patch
* target/linux/generic/pending-4.9/181-net-usb-add-lte-modem-wistron-neweb-d18q1.patch
* target/linux/generic/pending-4.9/182-net-qmi_wwan-add-BroadMobi-BM806U-2020-2033.patch
Signed-off-by: Stijn Segers <foss@volatilesystems.org>
Diffstat (limited to 'target/linux/generic/backport-4.9/071-v4.10-0001-net-bgmac-allocate-struct-bgmac-just-once-don-t-copy.patch')
| -rw-r--r-- | target/linux/generic/backport-4.9/071-v4.10-0001-net-bgmac-allocate-struct-bgmac-just-once-don-t-copy.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/backport-4.9/071-v4.10-0001-net-bgmac-allocate-struct-bgmac-just-once-don-t-copy.patch b/target/linux/generic/backport-4.9/071-v4.10-0001-net-bgmac-allocate-struct-bgmac-just-once-don-t-copy.patch index d16948668c..4b667bc2f3 100644 --- a/target/linux/generic/backport-4.9/071-v4.10-0001-net-bgmac-allocate-struct-bgmac-just-once-don-t-copy.patch +++ b/target/linux/generic/backport-4.9/071-v4.10-0001-net-bgmac-allocate-struct-bgmac-just-once-don-t-copy.patch @@ -68,7 +68,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c -@@ -1459,22 +1459,32 @@ static int bgmac_phy_connect(struct bgma +@@ -1460,22 +1460,32 @@ static int bgmac_phy_connect(struct bgma return 0; } @@ -106,7 +106,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> net_dev->irq = bgmac->irq; SET_NETDEV_DEV(net_dev, bgmac->dev); -@@ -1501,7 +1511,7 @@ int bgmac_enet_probe(struct bgmac *info) +@@ -1502,7 +1512,7 @@ int bgmac_enet_probe(struct bgmac *info) err = bgmac_dma_alloc(bgmac); if (err) { dev_err(bgmac->dev, "Unable to alloc memory for DMA\n"); @@ -115,7 +115,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> } bgmac->int_mask = BGMAC_IS_ERRMASK | BGMAC_IS_RX | BGMAC_IS_TX_MASK; -@@ -1537,8 +1547,7 @@ err_phy_disconnect: +@@ -1538,8 +1548,7 @@ err_phy_disconnect: phy_disconnect(net_dev->phydev); err_dma_free: bgmac_dma_free(bgmac); |