From 054d7b5ad5dadca7a40f52e7a2ea43dbe2c3dc8b Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Thu, 16 Feb 2012 02:38:48 +0000 Subject: [PATCH] --- yaml --- r: 290210 b: refs/heads/master c: 56ad315250bec1cd239c18712e072d1ff1f4aaf3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 2 -- trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 4 +++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 41051205c411..2e75471cfc46 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32efe08d77f5902ce7315fc9003c010ffffb8268 +refs/heads/master: 56ad315250bec1cd239c18712e072d1ff1f4aaf3 diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h index d60b5f073b6f..604060ab8872 100644 --- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h +++ b/trunk/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, #define BNX2X_VPD_LEN 128 #define VENDOR_ID_LEN 4 -int bnx2x_close(struct net_device *dev); - /* Congestion management fairness mode */ #define CMNG_FNS_NONE 0 #define CMNG_FNS_MINMAX 1 diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index 644d8e9f61b1..9831d8c416a9 100644 --- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -8711,6 +8711,8 @@ static void bnx2x_parity_recover(struct bnx2x *bp) } } +static int bnx2x_close(struct net_device *dev); + /* bnx2x_nic_unload() flushes the bnx2x_wq, thus reset task is * scheduled on a general queue in order to prevent a dead lock. */ @@ -10288,7 +10290,7 @@ static int bnx2x_open(struct net_device *dev) } /* called with rtnl_lock */ -int bnx2x_close(struct net_device *dev) +static int bnx2x_close(struct net_device *dev) { struct bnx2x *bp = netdev_priv(dev);