diff options
Diffstat (limited to 'trunk/2.6.21/21359_linux-2.6-netdev-e1000e-10.patch')
| -rw-r--r-- | trunk/2.6.21/21359_linux-2.6-netdev-e1000e-10.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/trunk/2.6.21/21359_linux-2.6-netdev-e1000e-10.patch b/trunk/2.6.21/21359_linux-2.6-netdev-e1000e-10.patch new file mode 100644 index 0000000..dffe619 --- /dev/null +++ b/trunk/2.6.21/21359_linux-2.6-netdev-e1000e-10.patch @@ -0,0 +1,46 @@ +From: Auke Kok <auke-jan.h.kok@intel.com> +Date: Fri, 10 Aug 2007 20:01:07 +0000 (-0700) +Subject: e1000e: Remove two compile warnings +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fjgarzik%2Fnetdev-2.6.git;a=commitdiff_plain;h=3e4346712d03162af6b570aa17efb1201c4bf023 + +e1000e: Remove two compile warnings + +CC [M] drivers/net/e1000e/lib.o +drivers/net/e1000e/lib.c: In function 'e1000e_read_nvm_eerd': +drivers/net/e1000e/lib.c:1941: warning: 'ret_val' may be used uninitialized +in this function + CC [M] drivers/net/e1000e/phy.o +drivers/net/e1000e/phy.c: In function 'e1000e_phy_has_link_generic': +drivers/net/e1000e/phy.c:1324: warning: 'ret_val' may be used +uninitialized in this function + +Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> +Signed-off-by: Jeff Garzik <jeff@garzik.org> +--- + +diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c +index a04c1e4..6645c21 100644 +--- a/drivers/net/e1000e/lib.c ++++ b/drivers/net/e1000e/lib.c +@@ -1938,7 +1938,7 @@ s32 e1000e_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data) + { + struct e1000_nvm_info *nvm = &hw->nvm; + u32 i, eerd = 0; +- s32 ret_val; ++ s32 ret_val = 0; + + /* A check for invalid values: offset too large, too many words, + * and not enough words. */ +diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c +index 1efb47a..7932318 100644 +--- a/drivers/net/e1000e/phy.c ++++ b/drivers/net/e1000e/phy.c +@@ -1321,7 +1321,7 @@ static s32 e1000_wait_autoneg(struct e1000_hw *hw) + s32 e1000e_phy_has_link_generic(struct e1000_hw *hw, u32 iterations, + u32 usec_interval, bool *success) + { +- s32 ret_val; ++ s32 ret_val = 0; + u16 i, phy_status; + + for (i = 0; i < iterations; i++) { |