Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (49 commits)
  [SCTP]: Set assoc_id correctly during INIT collision.
  [SCTP]: Re-order SCTP initializations to avoid race with sctp_rcv()
  [SCTP]: Fix the SO_REUSEADDR handling to be similar to TCP.
  [SCTP]: Verify all destination ports in sctp_connectx.
  [XFRM] SPD info TLV aggregation
  [XFRM] SAD info TLV aggregationx
  [AF_RXRPC]: Sort out MTU handling.
  [AF_IUCV/IUCV] : Add missing section annotations
  [AF_IUCV]: Implementation of a skb backlog queue
  [NETLINK]: Remove bogus BUG_ON
  [IPV6]: Some cleanups in include/net/ipv6.h
  [TCP]: zero out rx_opt in tcp_disconnect()
  [BNX2]: Fix TSO problem with small MSS.
  [NET]: Rework dev_base via list_head (v3)
  [TCP] Highspeed: Limited slow-start is nowadays in tcp_slow_start
  [BNX2]: Update version and reldate.
  [BNX2]: Print bus information for PCIE devices.
  [BNX2]: Add 1-shot MSI handler for 5709.
  [BNX2]: Restructure PHY event handling.
  [BNX2]: Add indirect spinlock.
  ...

1 files changed, 7 insertions, 8 deletions

diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 2506021c2935..f4dd47453108 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -2288,9 +2288,8 @@ static inline struct ip_mc_list *igmp_mc_get_first(struct seq_file *seq)
         struct ip_mc_list *im = NULL;
         struct igmp_mc_iter_state *state = igmp_mc_seq_private(seq);
 
-        for (state->dev = dev_base, state->in_dev = NULL;
-             state->dev;
-             state->dev = state->dev->next) {
+        state->in_dev = NULL;
+        for_each_netdev(state->dev) {
                 struct in_device *in_dev;
                 in_dev = in_dev_get(state->dev);
                 if (!in_dev)
@@ -2316,7 +2315,7 @@ static struct ip_mc_list *igmp_mc_get_next(struct seq_file *seq, struct ip_mc_li
                         read_unlock(&state->in_dev->mc_list_lock);
                         in_dev_put(state->in_dev);
                 }
-                state->dev = state->dev->next;
+                state->dev = next_net_device(state->dev);
                 if (!state->dev) {
                         state->in_dev = NULL;
                         break;
@@ -2450,9 +2449,9 @@ static inline struct ip_sf_list *igmp_mcf_get_first(struct seq_file *seq)
         struct ip_mc_list *im = NULL;
         struct igmp_mcf_iter_state *state = igmp_mcf_seq_private(seq);
 
-        for (state->dev = dev_base, state->idev = NULL, state->im = NULL;
-             state->dev;
-             state->dev = state->dev->next) {
+        state->idev = NULL;
+        state->im = NULL;
+        for_each_netdev(state->dev) {
                 struct in_device *idev;
                 idev = in_dev_get(state->dev);
                 if (unlikely(idev == NULL))
@@ -2488,7 +2487,7 @@ static struct ip_sf_list *igmp_mcf_get_next(struct seq_file *seq, struct ip_sf_l
                                 read_unlock(&state->idev->mc_list_lock);
                                 in_dev_put(state->idev);
                         }
-                        state->dev = state->dev->next;
+                        state->dev = next_net_device(state->dev);
                         if (!state->dev) {
                                 state->idev = NULL;
                                 goto out;