From 70240c65659686b1d31a077bfc8bb6f87b8f8af5 Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Thu, 15 Dec 2011 06:48:37 +0000 Subject: [PATCH] --- yaml --- r: 278824 b: refs/heads/master c: cb9ffb76949cd7b17c8468f8bf10d0ff75d4cdd2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/mellanox/mlx4/port.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 01a87a17ec00..1f89f4fadbf2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4721d22160c2d37a2e8a0841578bbe8a937b7000 +refs/heads/master: cb9ffb76949cd7b17c8468f8bf10d0ff75d4cdd2 diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/port.c b/trunk/drivers/net/ethernet/mellanox/mlx4/port.c index 00a9547773c1..88b52e547524 100644 --- a/trunk/drivers/net/ethernet/mellanox/mlx4/port.c +++ b/trunk/drivers/net/ethernet/mellanox/mlx4/port.c @@ -783,7 +783,7 @@ int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port) return err; } -static int mlx4_SET_PORT_general(struct mlx4_dev *dev, u8 port, int mtu, +int mlx4_SET_PORT_general(struct mlx4_dev *dev, u8 port, int mtu, u8 pptx, u8 pfctx, u8 pprx, u8 pfcrx) { struct mlx4_cmd_mailbox *mailbox; @@ -813,7 +813,7 @@ static int mlx4_SET_PORT_general(struct mlx4_dev *dev, u8 port, int mtu, } EXPORT_SYMBOL(mlx4_SET_PORT_general); -static int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn, +int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn, u8 promisc) { struct mlx4_cmd_mailbox *mailbox;