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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1244 commits)
  pkt_sched: Rename PSCHED_US2NS and PSCHED_NS2US
  ipv4: Fix fib_trie rebalancing
  Bluetooth: Fix issue with uninitialized nsh.type in DTL-1 driver
  Bluetooth: Fix Kconfig issue with RFKILL integration
  PIM-SM: namespace changes
  ipv4: update ARPD help text
  net: use a deferred timer in rt_check_expire
  ieee802154: fix kconfig bool/tristate muckup
  bonding: initialization rework
  bonding: use is_zero_ether_addr
  bonding: network device names are case sensative
  bonding: elminate bad refcount code
  bonding: fix style issues
  bonding: fix destructor
  bonding: remove bonding read/write semaphore
  bonding: initialize before registration
  bonding: bond_create always called with default parameters
  x_tables: Convert printk to pr_err
  netfilter: conntrack: optional reliable conntrack event delivery
  list_nulls: add hlist_nulls_add_head and hlist_nulls_del
  ...

1 files changed, 3 insertions, 4 deletions

diff --git a/net/sctp/ulpevent.c b/net/sctp/ulpevent.c
index 5f186ca550d7..8b3560fd876d 100644
--- a/net/sctp/ulpevent.c
+++ b/net/sctp/ulpevent.c
@@ -976,9 +976,8 @@ static void sctp_ulpevent_receive_data(struct sctp_ulpevent *event,
          * In general, the skb passed from IP can have only 1 level of
          * fragments. But we allow multiple levels of fragments.
          */
-        for (frag = skb_shinfo(skb)->frag_list; frag; frag = frag->next) {
+        skb_walk_frags(skb, frag)
                 sctp_ulpevent_receive_data(sctp_skb2event(frag), asoc);
-        }
 }
 
 /* Do accounting for bytes just read by user and release the references to
@@ -1003,7 +1002,7 @@ static void sctp_ulpevent_release_data(struct sctp_ulpevent *event)
                 goto done;
 
         /* Don't forget the fragments. */
-        for (frag = skb_shinfo(skb)->frag_list; frag; frag = frag->next) {
+        skb_walk_frags(skb, frag) {
                 /* NOTE:  skb_shinfos are recursive. Although IP returns
                  * skb's with only 1 level of fragments, SCTP reassembly can
                  * increase the levels.
@@ -1026,7 +1025,7 @@ static void sctp_ulpevent_release_frag_data(struct sctp_ulpevent *event)
                 goto done;
 
         /* Don't forget the fragments. */
-        for (frag = skb_shinfo(skb)->frag_list; frag; frag = frag->next) {
+        skb_walk_frags(skb, frag) {
                 /* NOTE:  skb_shinfos are recursive. Although IP returns
                  * skb's with only 1 level of fragments, SCTP reassembly can
                  * increase the levels.