diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:45:41 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:45:41 -0400 |
| commit | 1c7da74c4aab595a994beb5fe728ebf0d0b41f59 (patch) | |
| tree | 64128abdf9550ebb51d8f3ee6732d7350b9c62f2 /drivers/net/bonding | |
| parent | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (diff) | |
| parent | 1bdfd554be94def718323659173517c5d4a69d25 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/net/bonding')
| -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 0fb5f653d3ce..c0bbddae4ec4 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
| @@ -2252,7 +2252,7 @@ static u32 bond_glean_dev_ip(struct net_device *dev) | |||
| 2252 | { | 2252 | { |
| 2253 | struct in_device *idev; | 2253 | struct in_device *idev; |
| 2254 | struct in_ifaddr *ifa; | 2254 | struct in_ifaddr *ifa; |
| 2255 | u32 addr = 0; | 2255 | __be32 addr = 0; |
| 2256 | 2256 | ||
| 2257 | if (!dev) | 2257 | if (!dev) |
| 2258 | return 0; | 2258 | return 0; |