From dc21fcd56d8d1b096ccbb72b5a1147275c702057 Mon Sep 17 00:00:00 2001 From: Vladislav Zolotarov Date: Sun, 24 Jul 2011 03:58:38 +0000 Subject: [PATCH] --- yaml --- r: 258572 b: refs/heads/master c: b6c2f86e6305be612f1196459f22343523f7049f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/bnx2x/bnx2x_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7cd2c42f1202..0f57b8e47060 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1fb8740a279a96d8b6ceedfce334b887908b91d +refs/heads/master: b6c2f86e6305be612f1196459f22343523f7049f diff --git a/trunk/drivers/net/bnx2x/bnx2x_main.c b/trunk/drivers/net/bnx2x/bnx2x_main.c index e5d5d4fb1de5..150709111548 100644 --- a/trunk/drivers/net/bnx2x/bnx2x_main.c +++ b/trunk/drivers/net/bnx2x/bnx2x_main.c @@ -5652,7 +5652,7 @@ static void bnx2x_init_pxp(struct bnx2x *bp) int r_order, w_order; pci_read_config_word(bp->pdev, - bp->pdev->pcie_cap + PCI_EXP_DEVCTL, &devctl); + pci_pcie_cap(bp->pdev) + PCI_EXP_DEVCTL, &devctl); DP(NETIF_MSG_HW, "read 0x%x from devctl\n", devctl); w_order = ((devctl & PCI_EXP_DEVCTL_PAYLOAD) >> 5); if (bp->mrrs == -1)