diff options
| author | David S. Miller <davem@davemloft.net> | 2020-01-09 12:10:26 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-01-09 12:13:43 -0800 |
| commit | a2d6d7ae591c47ebc04926cb29a840adfdde49e6 (patch) | |
| tree | be464f987f0ab690481e2783d680aa88574026e4 /drivers/atm | |
| parent | b1daa4d194731ab484fb22742506dd25ad1a5628 (diff) | |
| parent | e69ec487b2c7c82ef99b4b15122f58a2a99289a3 (diff) | |
| download | linux-a2d6d7ae591c47ebc04926cb29a840adfdde49e6.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
The ungrafting from PRIO bug fixes in net, when merged into net-next,
merge cleanly but create a build failure. The resolution used here is
from Petr Machata.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/atm')
| -rw-r--r-- | drivers/atm/eni.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c index b23d1e4bad33b..9d0d65efcd94e 100644 --- a/drivers/atm/eni.c +++ b/drivers/atm/eni.c @@ -374,7 +374,7 @@ static int do_rx_dma(struct atm_vcc *vcc,struct sk_buff *skb, here = (eni_vcc->descr+skip) & (eni_vcc->words-1); dma[j++] = (here << MID_DMA_COUNT_SHIFT) | (vcc->vci << MID_DMA_VCI_SHIFT) | MID_DT_JK; - j++; + dma[j++] = 0; } here = (eni_vcc->descr+size+skip) & (eni_vcc->words-1); if (!eff) size += skip; @@ -447,7 +447,7 @@ static int do_rx_dma(struct atm_vcc *vcc,struct sk_buff *skb, if (size != eff) { dma[j++] = (here << MID_DMA_COUNT_SHIFT) | (vcc->vci << MID_DMA_VCI_SHIFT) | MID_DT_JK; - j++; + dma[j++] = 0; } if (!j || j > 2*RX_DMA_BUF) { printk(KERN_CRIT DEV_LABEL "!j or j too big!!!\n"); |