← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-linaro-vexpress/quantal

« back to all changes in this revision

Viewing changes to net/netfilter/nf_log.c

  • Committer: Bazaar Package Importer
  • Author(s): John Rigby, John Rigby
  • Date: 2011-03-18 07:36:33 UTC
  • mfrom: (5.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20110318073633-tqfe9391ct71zb2p
Tags: 2.6.38-1001.2
https://launchpad.net/bugs/724377
https://launchpad.net/bugs/728603
https://launchpad.net/bugs/720055
https://launchpad.net/bugs/718677
https://launchpad.net/bugs/708883
https://launchpad.net/bugs/723159
https://launchpad.net/bugs/736429
[ John Rigby ]

* Rebase to new upstreams:
  Linux v2.6.38-rc6 -- same
  linaro-linux-2.6.38-upstream-1Mar2011 -- new
  Ubuntu-2.6.38-5.32 -- same
  - LP: #724377
* Enable CONFIG_THUMB2_KERNEL for OMAP[34]
* Bump ABI
* Rebase to new upstreams:
  Linux v2.6.38-rc7
  linaro-linux-2.6.38-upstream-4Mar2011
  ubuntu-natty master-next as of 4Mar2011
* Re-enable display on OMAP4
* Disable CONFIG_OMAP2_DSS_SDI
  - LP: #728603
  - LP: #720055
* Rebase to new upstreams:
  Linux v2.6.38-rc8
  linaro-linux-2.6.38-upstream-9Mar2011
    rebased to 2.6.38-rc8
* Remove generated file kernel-versions and sort kernel-versions.in
* Enable CONFIG_TIMER_STATS
  - LP: #718677
* Rebase to new upstreams:
  Linux v2.6.38 final
  linaro-linux-2.6.38-upstream-16Mar2011
  - LP: #708883
  - LP: #723159
  ubuntu-natty Ubuntu-2.6.38-7.35
* Enable CONFIG_IP_PNP and CONFIG_ROOT_NFS for all flavours
  - LP: #736429
* mach-ux500: fix build error
  workaround a problem in linux-linaro-2.6.38
* OMAP4:Fix -EINVAL for vana, vcxio, vdac
  from omap-linux mailing list pending ack
* turn off ROOT_NFS for mx51
  it makes the kernel too large to boot with current hwpack settings

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/netfilter/nf_log.c
85
85
 
86
86
int nf_log_bind_pf(u_int8_t pf, const struct nf_logger *logger)
87
87
{
 
88
        if (pf >= ARRAY_SIZE(nf_loggers))
 
89
                return -EINVAL;
88
90
        mutex_lock(&nf_log_mutex);
89
91
        if (__find_logger(pf, logger->name) == NULL) {
90
92
                mutex_unlock(&nf_log_mutex);
98
100
 
99
101
void nf_log_unbind_pf(u_int8_t pf)
100
102
{
 
103
        if (pf >= ARRAY_SIZE(nf_loggers))
 
104
                return;
101
105
        mutex_lock(&nf_log_mutex);
102
106
        rcu_assign_pointer(nf_loggers[pf], NULL);
103
107
        mutex_unlock(&nf_log_mutex);