diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /include/net/sock.h | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 5dc9f5be3..92519ee88 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -242,6 +242,7 @@ struct tcp_opt { __u32 lrcvtime; /* timestamp of last received data packet*/ __u16 last_seg_size; /* Size of last incoming segment */ __u16 rcv_mss; /* MSS used for delayed ACK decisions */ + __u32 rcv_segs; /* Number of received segments since last ack */ } ack; /* Data for direct copy to user */ @@ -325,7 +326,6 @@ struct tcp_opt { __u32 rcv_tsecr; /* Time stamp echo reply */ __u32 ts_recent; /* Time stamp to echo next */ long ts_recent_stamp;/* Time we stored ts_recent (for aging) */ - __u32 last_ack_sent; /* last ack we sent (RTTM/PAWS) */ /* SACKs data */ struct tcp_sack_block selective_acks[4]; /* The SACKS themselves*/ @@ -934,20 +934,20 @@ extern __inline__ void sock_put(struct sock *sk) */ extern __inline__ void sock_orphan(struct sock *sk) { - write_lock_irq(&sk->callback_lock); + write_lock_bh(&sk->callback_lock); sk->dead = 1; sk->socket = NULL; sk->sleep = NULL; - write_unlock_irq(&sk->callback_lock); + write_unlock_bh(&sk->callback_lock); } extern __inline__ void sock_graft(struct sock *sk, struct socket *parent) { - write_lock_irq(&sk->callback_lock); + write_lock_bh(&sk->callback_lock); sk->sleep = &parent->wait; parent->sk = sk; sk->socket = parent; - write_unlock_irq(&sk->callback_lock); + write_unlock_bh(&sk->callback_lock); } @@ -1150,7 +1150,7 @@ extern __inline__ int sock_writeable(struct sock *sk) extern __inline__ int gfp_any(void) { - return in_interrupt() ? GFP_ATOMIC : GFP_KERNEL; + return in_softirq() ? GFP_ATOMIC : GFP_KERNEL; } extern __inline__ long sock_rcvtimeo(struct sock *sk, int noblock) |