Merge commit 'v2.6.30-rc5' into core/iommu

Merge reason: core/iommu was on an .30-rc1 base,
              update it to .30-rc5 to refresh.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

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)
                 rc = 1;
                 break;
         case ibft_eth_ip_addr:
-                if (!memcmp(nic->dhcp, nulls, sizeof(nic->dhcp)))
+                if (memcmp(nic->ip_addr, nulls, sizeof(nic->ip_addr)))
                         rc = 1;
                 break;
         case ibft_eth_subnet_mask:
-                if (!memcmp(nic->dhcp, nulls, sizeof(nic->dhcp)))
+                if (nic->subnet_mask_prefix)
                         rc = 1;
                 break;
         case ibft_eth_origin: