diff options
| author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-10-29 18:46:13 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-10-30 19:32:16 +0100 |
| commit | 273dc74e1c7d9aa2eab2036153c8fe65593fb85e (patch) | |
| tree | 9f854fce92cea3e9785ed67ced0801a09d3db2d2 /drivers/net/ixgb/ixgb_ethtool.c | |
| parent | e1000e: fix sparse warnings (diff) | |
| download | linux-273dc74e1c7d9aa2eab2036153c8fe65593fb85e.tar.xz linux-273dc74e1c7d9aa2eab2036153c8fe65593fb85e.zip | |
ixgb: fix sparse warnings
Fix sparse warnings in ixgb driver for net-2.6.24.
Added a sparse fix for invalid declaration using non-constant value
in ixgb_set_multi. Added a fix for the module param array index
and allows int params in the array. --Auke
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/ixgb/ixgb_ethtool.c')
| -rw-r--r-- | drivers/net/ixgb/ixgb_ethtool.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/ixgb/ixgb_ethtool.c b/drivers/net/ixgb/ixgb_ethtool.c index fddd5844168d..a267dd862520 100644 --- a/drivers/net/ixgb/ixgb_ethtool.c +++ b/drivers/net/ixgb/ixgb_ethtool.c @@ -32,9 +32,6 @@ #include <asm/uaccess.h> -extern char ixgb_driver_name[]; -extern char ixgb_driver_version[]; - extern int ixgb_up(struct ixgb_adapter *adapter); extern void ixgb_down(struct ixgb_adapter *adapter, boolean_t kill_watchdog); extern void ixgb_reset(struct ixgb_adapter *adapter); @@ -639,8 +636,8 @@ ixgb_phys_id(struct net_device *netdev, uint32_t data) { struct ixgb_adapter *adapter = netdev_priv(netdev); - if(!data || data > (uint32_t)(MAX_SCHEDULE_TIMEOUT / HZ)) - data = (uint32_t)(MAX_SCHEDULE_TIMEOUT / HZ); + if (!data) + data = INT_MAX; if(!adapter->blink_timer.function) { init_timer(&adapter->blink_timer); |