Skip to contentSkip to conversation

mlx4: Fix compile error when driver is comiled-in

PATCH In review Joerg Roedel 2 participants 2 messages Dec 15, 2011 – Dec 16, 2011

Subsystems (3)
Networking Network drivers Mellanox MLX4 core VPI driver
lore
Share & tools
lore

Joerg Roedel

author
#0 lore raw

PATCH 1/1 mlx4: Fix compile error when driver is comiled-in

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.

Quoted 1 line

From b993c4448c2ce5447fd24e7d4fce02e633d3222e Mon Sep 17 00:00:00 2001

From: Joerg Roedel <[email protected]>
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 <[email protected]>
---
 drivers/net/ethernet/mellanox/mlx4/port.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx4/port.c +2 -2
index 00a9547..88b52e5 100644
@@ -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;
Signature · 9 lines
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
maintainer
#1 lore raw

From: Joerg Roedel <[email protected]>
Date: Thu, 15 Dec 2011 17:48:37 +0100

Quoted 6 lines

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.

Quoted 1 line

From b993c4448c2ce5447fd24e7d4fce02e633d3222e Mon Sep 17 00:00:00 2001

Quoted 8 lines

From: Joerg Roedel <[email protected]>
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 <[email protected]>

I wish we detected "exporting symbol marked static" properly.

I'll apply this, thanks!