From 84830aa9f9077bb247d67c44daf86ceb4dc7b018 Mon Sep 17 00:00:00 2001 From: Hannes Eder Date: Sat, 14 Feb 2009 11:16:04 +0000 Subject: [PATCH] --- yaml --- r: 134599 b: refs/heads/master c: 97915b5bf6454416c7b27444fc95c08132b74251 h: refs/heads/master i: 134597: f0ec7b52dade6b34af3451d30a3a2aec8bce9292 134595: 24db1d6326720ab56641be74e6fca56399302d86 134591: b95124dec4a87086f3bb298424a893b780f29992 v: v3 --- [refs] | 2 +- trunk/drivers/net/cxgb3/cxgb3_main.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index eb6ca8cde673..a6143bdee8e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54b87323eddd9b7854249f05cfd183a0ac602ab6 +refs/heads/master: 97915b5bf6454416c7b27444fc95c08132b74251 diff --git a/trunk/drivers/net/cxgb3/cxgb3_main.c b/trunk/drivers/net/cxgb3/cxgb3_main.c index f2c7cc3e263a..0f6062aaa2c6 100644 --- a/trunk/drivers/net/cxgb3/cxgb3_main.c +++ b/trunk/drivers/net/cxgb3/cxgb3_main.c @@ -1565,7 +1565,6 @@ static int speed_duplex_to_caps(int speed, int duplex) static int set_settings(struct net_device *dev, struct ethtool_cmd *cmd) { - int cap; struct port_info *p = netdev_priv(dev); struct link_config *lc = &p->link_config; @@ -1575,7 +1574,7 @@ static int set_settings(struct net_device *dev, struct ethtool_cmd *cmd) * being requested. */ if (cmd->autoneg == AUTONEG_DISABLE) { - cap = speed_duplex_to_caps(cmd->speed, cmd->duplex); + int cap = speed_duplex_to_caps(cmd->speed, cmd->duplex); if (lc->supported & cap) return 0; }