From 56596a3db30b185c3064fe0188ec355e0fc99b97 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 1 Mar 2009 20:32:39 -0800 Subject: [PATCH] --- yaml --- r: 134964 b: refs/heads/master c: fc1f209514691af9167e462880e858efc8b22d83 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbe/ixgbe_common.c | 2 +- trunk/drivers/net/ixgbe/ixgbe_dcb_82599.c | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7319eeb6eafc..2c0270f1ade2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d517c4a1da590a7fa50325a5e5cd18f07e8fb5a7 +refs/heads/master: fc1f209514691af9167e462880e858efc8b22d83 diff --git a/trunk/drivers/net/ixgbe/ixgbe_common.c b/trunk/drivers/net/ixgbe/ixgbe_common.c index 26ee8a04646e..245db0e712e7 100644 --- a/trunk/drivers/net/ixgbe/ixgbe_common.c +++ b/trunk/drivers/net/ixgbe/ixgbe_common.c @@ -661,7 +661,7 @@ static s32 ixgbe_poll_eeprom_eerd_done(struct ixgbe_hw *hw) static s32 ixgbe_acquire_eeprom(struct ixgbe_hw *hw) { s32 status = 0; - u32 eec; + u32 eec = 0; u32 i; if (ixgbe_acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) != 0) diff --git a/trunk/drivers/net/ixgbe/ixgbe_dcb_82599.c b/trunk/drivers/net/ixgbe/ixgbe_dcb_82599.c index 1467d56435a0..adcbac422634 100644 --- a/trunk/drivers/net/ixgbe/ixgbe_dcb_82599.c +++ b/trunk/drivers/net/ixgbe/ixgbe_dcb_82599.c @@ -457,8 +457,6 @@ s32 ixgbe_dcb_config_82599(struct ixgbe_hw *hw) s32 ixgbe_dcb_hw_config_82599(struct ixgbe_hw *hw, struct ixgbe_dcb_config *dcb_config) { - u32 pap = 0; - ixgbe_dcb_config_packet_buffers_82599(hw, dcb_config); ixgbe_dcb_config_82599(hw); ixgbe_dcb_config_rx_arbiter_82599(hw, dcb_config);