diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-23 15:57:31 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-23 15:57:31 -0400 |
| commit | a2ab67fae1ab9226679495a8d260f4e6555efc5f (patch) | |
| tree | f7de683c9c8ff0869a7e11f1d40802145d05f5b4 /drivers/firmware/iscsi_ibft.c | |
| parent | 6d0485a99366d4e0e7e725f14995c74cb7ca4499 (diff) | |
| parent | 135cad366b4e7d6a79f6369f6cb5b721985aa62f (diff) | |
Merge branch 'for-rmk-devel' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
Diffstat (limited to 'drivers/firmware/iscsi_ibft.c')
| -rw-r--r-- | drivers/firmware/iscsi_ibft.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c index 7b7ddc2d51c9..420a96e7f2db 100644 --- a/drivers/firmware/iscsi_ibft.c +++ b/drivers/firmware/iscsi_ibft.c | |||
| @@ -754,11 +754,11 @@ static int __init ibft_check_nic_for(struct ibft_nic *nic, int entry) | |||
| 754 | rc = 1; | 754 | rc = 1; |
| 755 | break; | 755 | break; |
| 756 | case ibft_eth_ip_addr: | 756 | case ibft_eth_ip_addr: |
| 757 | if (!memcmp(nic->dhcp, nulls, sizeof(nic->dhcp))) | 757 | if (memcmp(nic->ip_addr, nulls, sizeof(nic->ip_addr))) |
| 758 | rc = 1; | 758 | rc = 1; |
| 759 | break; | 759 | break; |
| 760 | case ibft_eth_subnet_mask: | 760 | case ibft_eth_subnet_mask: |
| 761 | if (!memcmp(nic->dhcp, nulls, sizeof(nic->dhcp))) | 761 | if (nic->subnet_mask_prefix) |
| 762 | rc = 1; | 762 | rc = 1; |
| 763 | break; | 763 | break; |
| 764 | case ibft_eth_origin: | 764 | case ibft_eth_origin: |