diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-11 10:46:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-11 10:46:53 -0400 |
| commit | e4cb04074c5f5593f98ba2a89a011034f57604e4 (patch) | |
| tree | bea628194dd7d7481338b954b592ca56477e4429 /include | |
| parent | cabe456902e709095ebf1481342ea89910887d60 (diff) | |
| parent | 0a9c73014415d2a84dac346c1e12169142a6ad37 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[INET_DIAG]: Fix oops in netlink_rcv_skb
[IPv6]: Fix NULL pointer dereference in ip6_flush_pending_frames
[NETFILTER]: Fix/improve deadlock condition on module removal netfilter
[NETFILTER]: nf_conntrack_ipv4: fix "Frag of proto ..." messages
[NET] DOC: Update networking/multiqueue.txt with correct information.
[IPV6]: Freeing alive inet6 address
[DECNET]: Fix interface address listing regression.
[IPV4] devinet: show all addresses assigned to interface
[NET]: Do not dereference iov if length is zero
[TG3]: Workaround MSI bug on 5714/5780.
[Bluetooth] Fix parameter list for event filter command
[Bluetooth] Update security filter for Bluetooth 2.1
[Bluetooth] Add compat handling for timestamp structure
[Bluetooth] Add missing stat.byte_rx counter modification
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netfilter.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h index 0eed0b7ab2df..1dd075eda595 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h | |||
| @@ -88,9 +88,8 @@ struct nf_sockopt_ops | |||
| 88 | int (*compat_get)(struct sock *sk, int optval, | 88 | int (*compat_get)(struct sock *sk, int optval, |
| 89 | void __user *user, int *len); | 89 | void __user *user, int *len); |
| 90 | 90 | ||
| 91 | /* Number of users inside set() or get(). */ | 91 | /* Use the module struct to lock set/get code in place */ |
| 92 | unsigned int use; | 92 | struct module *owner; |
| 93 | struct task_struct *cleanup_task; | ||
| 94 | }; | 93 | }; |
| 95 | 94 | ||
| 96 | /* Each queued (to userspace) skbuff has one of these. */ | 95 | /* Each queued (to userspace) skbuff has one of these. */ |