From: Joerg Roedel <joerg.roedel@amd•com>
To: "David S. Miller" <davem@davemloft•net>,
Yevgeny Petrilin <yevgenyp@mellanox•co.il>
Cc: <netdev@vger•kernel.org>, <linux-kernel@vger•kernel.org>,
Stephen Rothwell <sfr@canb•auug.org.au>
Subject: [PATCH] mlx4: Fix compile error when driver is comiled-in
Date: Thu, 15 Dec 2011 17:48:37 +0100 [thread overview]
Message-ID: <20111215164837.GE2112@amd.com> (raw)
Hi,
Testing my iommu-configs against linux-next found a compile error for
allyesconfig. It only happens when the mlx4 driver is compiled into the
kernel and not as a module because these two static functions are also
used in another file. The attached patch fixes it.
>From b993c4448c2ce5447fd24e7d4fce02e633d3222e Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel@amd•com>
Date: Thu, 15 Dec 2011 17:30:33 +0100
Subject: [PATCH 1/2] mlx4: Fix compile error when driver is comiled-in
This patch fixes a compile error that occurs when the driver
is compile into the kernel and not as a module.
Signed-off-by: Joerg Roedel <joerg.roedel@amd•com>
---
drivers/net/ethernet/mellanox/mlx4/port.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx4/port.c b/drivers/net/ethernet/mellanox/mlx4/port.c
index 00a9547..88b52e5 100644
--- a/drivers/net/ethernet/mellanox/mlx4/port.c
+++ b/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;
--
1.7.5.4
--
AMD Operating System Research Center
Advanced Micro Devices GmbH Einsteinring 24 85609 Dornach
General Managers: Alberto Bozzo, Andrew Bowd
Registration: Dornach, Landkr. Muenchen; Registerger. Muenchen, HRB Nr. 43632
next reply other threads:[~2011-12-15 16:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-15 16:48 Joerg Roedel [this message]
2011-12-16 20:27 ` [PATCH] mlx4: Fix compile error when driver is comiled-in David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111215164837.GE2112@amd.com \
--to=joerg.roedel@amd$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=yevgenyp@mellanox$(echo .)co.il \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox