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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  pkt_sched: sch_sfq: dump a real number of flows
  atm: [fore200e] use MODULE_FIRMWARE() and other suggested cleanups
  netfilter: make security table depend on NETFILTER_ADVANCED
  tcp: Clear probes_out more aggressively in tcp_ack().
  e1000e: fix e1000_netpoll(), remove extraneous e1000_clean_tx_irq() call
  net: Update entry in af_family_clock_key_strings
  netdev: Remove warning from __netif_schedule().
  sky2: don't stop queue on shutdown

diff --combined net/core/dev.c
index 7463a21,ccf97f9..53af784
--- 1/net/core/dev.c
--- 2/net/core/dev.c
+++ b/net/core/dev.c
@@@ -1341,9 -1341,6 +1341,6 @@@ static void dev_queue_xmit_nit(struct s
  
  void __netif_schedule(struct Qdisc *q)
  {
-       if (WARN_ON_ONCE(q == &noop_qdisc))
-               return;
- 
        if (!test_and_set_bit(__QDISC_STATE_SCHED, &q->state)) {
                struct softnet_data *sd;
                unsigned long flags;
@@@ -2398,7 -2395,7 +2395,7 @@@ out
         */
        if (!cpus_empty(net_dma.channel_mask)) {
                int chan_idx;
 -              for_each_cpu_mask(chan_idx, net_dma.channel_mask) {
 +              for_each_cpu_mask_nr(chan_idx, net_dma.channel_mask) {
                        struct dma_chan *chan = net_dma.channels[chan_idx];
                        if (chan)
                                dma_async_memcpy_issue_pending(chan);
@@@ -4533,7 -4530,7 +4530,7 @@@ static void net_dma_rebalance(struct ne
        i = 0;
        cpu = first_cpu(cpu_online_map);
  
 -      for_each_cpu_mask(chan_idx, net_dma->channel_mask) {
 +      for_each_cpu_mask_nr(chan_idx, net_dma->channel_mask) {
                chan = net_dma->channels[chan_idx];
  
                n = ((num_online_cpus() / cpus_weight(net_dma->channel_mask))