cgroup: Merge branch 'for-3.11-fixes' into for-3.12

[deliverable/linux.git] / drivers / net / wireless / ipw2x00 / ipw2200.c

diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 312fa0e42e6f5e0f29bf66e810a9bc4c41ca271a..6b823a1ab7892fd9c81be07ce56bc45e75a6b8f1 100644 (file)
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -8257,7 +8257,7 @@ static  int is_duplicate_packet(struct ipw_priv *priv,
                        u8 *mac = header->addr2;
                        int index = mac[5] % IPW_IBSS_MAC_HASH_SIZE;
 
-                       __list_for_each(p, &priv->ibss_mac_hash[index]) {
+                       list_for_each(p, &priv->ibss_mac_hash[index]) {
                                entry =
                                    list_entry(p, struct ipw_ibss_seq, list);
                                if (!memcmp(entry->mac, mac, ETH_ALEN))