projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[VOYAGER] fix up attribute packed specifiers in voyager.h
[powerpc.git]
/
include
/
net
/
inet_timewait_sock.h
diff --git
a/include/net/inet_timewait_sock.h
b/include/net/inet_timewait_sock.h
index
e837f98
..
5f48748
100644
(file)
--- a/
include/net/inet_timewait_sock.h
+++ b/
include/net/inet_timewait_sock.h
@@
-15,7
+15,6
@@
#ifndef _INET_TIMEWAIT_SOCK_
#define _INET_TIMEWAIT_SOCK_
#ifndef _INET_TIMEWAIT_SOCK_
#define _INET_TIMEWAIT_SOCK_
-#include <linux/config.h>
#include <linux/list.h>
#include <linux/module.h>
#include <linux/list.h>
#include <linux/module.h>
@@
-121,10
+120,10
@@
struct inet_timewait_sock {
unsigned char tw_rcv_wscale;
/* Socket demultiplex comparisons on incoming packets. */
/* these five are in inet_sock */
unsigned char tw_rcv_wscale;
/* Socket demultiplex comparisons on incoming packets. */
/* these five are in inet_sock */
- __
u16
tw_sport;
- __
u32
tw_daddr __attribute__((aligned(INET_TIMEWAIT_ADDRCMP_ALIGN_BYTES)));
- __
u32
tw_rcv_saddr;
- __
u16
tw_dport;
+ __
be16
tw_sport;
+ __
be32
tw_daddr __attribute__((aligned(INET_TIMEWAIT_ADDRCMP_ALIGN_BYTES)));
+ __
be32
tw_rcv_saddr;
+ __
be16
tw_dport;
__u16 tw_num;
/* And these are ours. */
__u8 tw_ipv6only:1;
__u16 tw_num;
/* And these are ours. */
__u8 tw_ipv6only:1;
@@
-187,7
+186,7
@@
static inline struct inet_timewait_sock *inet_twsk(const struct sock *sk)
return (struct inet_timewait_sock *)sk;
}
return (struct inet_timewait_sock *)sk;
}
-static inline
u
32 inet_rcv_saddr(const struct sock *sk)
+static inline
__be
32 inet_rcv_saddr(const struct sock *sk)
{
return likely(sk->sk_state != TCP_TIME_WAIT) ?
inet_sk(sk)->rcv_saddr : inet_twsk(sk)->tw_rcv_saddr;
{
return likely(sk->sk_state != TCP_TIME_WAIT) ?
inet_sk(sk)->rcv_saddr : inet_twsk(sk)->tw_rcv_saddr;
@@
-197,6
+196,7
@@
static inline void inet_twsk_put(struct inet_timewait_sock *tw)
{
if (atomic_dec_and_test(&tw->tw_refcnt)) {
struct module *owner = tw->tw_prot->owner;
{
if (atomic_dec_and_test(&tw->tw_refcnt)) {
struct module *owner = tw->tw_prot->owner;
+ twsk_destructor((struct sock *)tw);
#ifdef SOCK_REFCNT_DEBUG
printk(KERN_DEBUG "%s timewait_sock %p released\n",
tw->tw_prot->name, tw);
#ifdef SOCK_REFCNT_DEBUG
printk(KERN_DEBUG "%s timewait_sock %p released\n",
tw->tw_prot->name, tw);