Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/pci/vc.c b/drivers/pci/vc.c
index dfbab61a1b47..1fa3a3219c45 100644
--- a/drivers/pci/vc.c
+++ b/drivers/pci/vc.c
@@ -221,9 +221,9 @@ static int pci_vc_do_save_buffer(struct pci_dev *dev, int pos,
                 else
                         pci_write_config_word(dev, pos + PCI_VC_PORT_CTRL,
                                               *(u16 *)buf);
-                buf += 2;
+                buf += 4;
         }
-        len += 2;
+        len += 4;
 
         /*
          * If we have any Low Priority VCs and a VC Arbitration Table Offset