aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2012-02-15 21:38:48 -0500
committerDavid S. Miller <davem@davemloft.net>2012-02-19 19:02:41 -0500
commit56ad315250bec1cd239c18712e072d1ff1f4aaf3 (patch)
treeacf29863a377d22385c40f76c472c1099445a073 /drivers/net/ethernet
parent32efe08d77f5902ce7315fc9003c010ffffb8268 (diff)
bnx2x: make bnx2x_close() static again
Commit 8304859a "bnx2x: add fan failure event handling" made the function bnx2x_close() non-static unnecessarily. The function is not called from other sources. Make it static again. Signed-off-by: Michal Schmidt <mschmidt@redhat.com> Acked-by: Yuval Mintz <yuvalmin@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x.h2
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index d60b5f073b6f..604060ab8872 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -2078,8 +2078,6 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,
2078#define BNX2X_VPD_LEN 128 2078#define BNX2X_VPD_LEN 128
2079#define VENDOR_ID_LEN 4 2079#define VENDOR_ID_LEN 4
2080 2080
2081int bnx2x_close(struct net_device *dev);
2082
2083/* Congestion management fairness mode */ 2081/* Congestion management fairness mode */
2084#define CMNG_FNS_NONE 0 2082#define CMNG_FNS_NONE 0
2085#define CMNG_FNS_MINMAX 1 2083#define CMNG_FNS_MINMAX 1
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 644d8e9f61b1..9831d8c416a9 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -8711,6 +8711,8 @@ static void bnx2x_parity_recover(struct bnx2x *bp)
8711 } 8711 }
8712} 8712}
8713 8713
8714static int bnx2x_close(struct net_device *dev);
8715
8714/* bnx2x_nic_unload() flushes the bnx2x_wq, thus reset task is 8716/* bnx2x_nic_unload() flushes the bnx2x_wq, thus reset task is
8715 * scheduled on a general queue in order to prevent a dead lock. 8717 * scheduled on a general queue in order to prevent a dead lock.
8716 */ 8718 */
@@ -10288,7 +10290,7 @@ static int bnx2x_open(struct net_device *dev)
10288} 10290}
10289 10291
10290/* called with rtnl_lock */ 10292/* called with rtnl_lock */
10291int bnx2x_close(struct net_device *dev) 10293static int bnx2x_close(struct net_device *dev)
10292{ 10294{
10293 struct bnx2x *bp = netdev_priv(dev); 10295 struct bnx2x *bp = netdev_priv(dev);
10294 10296