From: David S. Miller Date: Mon, 16 Apr 2018 22:55:05 +0000 (-0400) Subject: Merge branch 'pci-mrrs-consts' X-Git-Tag: for-linus-20180616~56^2~453 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=4c85d2d4de8171f29bb0a5825febf2972d9e9741;p=linux-2.6-block.git Merge branch 'pci-mrrs-consts' Heiner Kallweit says: ==================== PCI: add two more values for PCIe Max_Read_Request_Size and initially use them in r8169 network driver In r8169 network driver I stumbled across a magic number translating to PCI MRRS size 4K. The PCI core is still missing constants for values 2K and 4K (as defined in PCI standard). So let's add these two constants and use the 4K constant in r8169. Second patch depends on the first one, therefore both patches preferrably should go through either PCI or netdev tree. ==================== Signed-off-by: David S. Miller --- 4c85d2d4de8171f29bb0a5825febf2972d9e9741