← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to net/netfilter/nf_log.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/netfilter/nf_log.c
165
165
        struct nf_logger *t;
166
166
        int ret;
167
167
 
168
 
        logger = nf_loggers[*pos];
 
168
        logger = rcu_dereference_protected(nf_loggers[*pos],
 
169
                                           lockdep_is_held(&nf_log_mutex));
169
170
 
170
171
        if (!logger)
171
172
                ret = seq_printf(s, "%2lld NONE (", *pos);
253
254
                mutex_unlock(&nf_log_mutex);
254
255
        } else {
255
256
                mutex_lock(&nf_log_mutex);
256
 
                logger = nf_loggers[tindex];
 
257
                logger = rcu_dereference_protected(nf_loggers[tindex],
 
258
                                                   lockdep_is_held(&nf_log_mutex));
257
259
                if (!logger)
258
260
                        table->data = "NONE";
259
261
                else