diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 10:29:35 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 10:29:35 -0800 |
commit | 0827f2b698735aee7cfb2990d393a82f6e1690eb (patch) | |
tree | 5eb1fa871154ab36c38794c4dc488698f13c71e0 /drivers/net/bonding/bond_main.c | |
parent | [PATCH] Fix boot-time slowdown for measure_migration_cost (diff) | |
parent | [PATCH] Clarify help text of SKGE/SK98LIN/SKY2 (diff) | |
download | linux-dev-0827f2b698735aee7cfb2990d393a82f6e1690eb.tar.xz linux-dev-0827f2b698735aee7cfb2990d393a82f6e1690eb.zip |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
-rw-r--r-- | drivers/net/bonding/bond_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 2582d98ef5c3..4ff006c37626 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -576,7 +576,7 @@ static int bond_update_speed_duplex(struct slave *slave) slave->duplex = DUPLEX_FULL; if (slave_dev->ethtool_ops) { - u32 res; + int res; if (!slave_dev->ethtool_ops->get_settings) { return -1; |