diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-27 02:48:40 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-27 02:48:40 -0500 |
| commit | 5b9ab2ec04ec1e1e53939768805612ac191d7ba2 (patch) | |
| tree | 22d29905c148d2d743b3eccb585fbe60fb91e25a /include/net/timewait_sock.h | |
| parent | 851fd7bd88524bb4e20f3def3127cd9167d6d0cf (diff) | |
| parent | 3ec192559033ed457f0d7856838654c100fc659f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/hp-plus.c
drivers/net/wireless/ath5k/base.c
drivers/net/wireless/ath9k/recv.c
net/wireless/reg.c
Diffstat (limited to 'include/net/timewait_sock.h')
| -rw-r--r-- | include/net/timewait_sock.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/timewait_sock.h b/include/net/timewait_sock.h index 1e1ee3253fd8..97c3b14da55d 100644 --- a/include/net/timewait_sock.h +++ b/include/net/timewait_sock.h | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | struct timewait_sock_ops { | 17 | struct timewait_sock_ops { |
| 18 | struct kmem_cache *twsk_slab; | 18 | struct kmem_cache *twsk_slab; |
| 19 | char *twsk_slab_name; | ||
| 19 | unsigned int twsk_obj_size; | 20 | unsigned int twsk_obj_size; |
| 20 | int (*twsk_unique)(struct sock *sk, | 21 | int (*twsk_unique)(struct sock *sk, |
| 21 | struct sock *sktw, void *twp); | 22 | struct sock *sktw, void *twp); |