Commit afeca340 authored by Krishna Kumar's avatar Krishna Kumar Committed by David S. Miller

tcp: Remove unrequired operations in tcp_push()

Remove unrequired operations in tcp_push()

Changelog:
	Removed a temporary skb variable from tcp_push()
Signed-off-by: default avatarKrishna Kumar <krkumar2@in.ibm.com>
Acked-by: default avatarIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 12d50c46
...@@ -536,8 +536,7 @@ static inline void skb_entail(struct sock *sk, struct sk_buff *skb) ...@@ -536,8 +536,7 @@ static inline void skb_entail(struct sock *sk, struct sk_buff *skb)
tp->nonagle &= ~TCP_NAGLE_PUSH; tp->nonagle &= ~TCP_NAGLE_PUSH;
} }
static inline void tcp_mark_urg(struct tcp_sock *tp, int flags, static inline void tcp_mark_urg(struct tcp_sock *tp, int flags)
struct sk_buff *skb)
{ {
if (flags & MSG_OOB) if (flags & MSG_OOB)
tp->snd_up = tp->write_seq; tp->snd_up = tp->write_seq;
...@@ -546,13 +545,13 @@ static inline void tcp_mark_urg(struct tcp_sock *tp, int flags, ...@@ -546,13 +545,13 @@ static inline void tcp_mark_urg(struct tcp_sock *tp, int flags,
static inline void tcp_push(struct sock *sk, int flags, int mss_now, static inline void tcp_push(struct sock *sk, int flags, int mss_now,
int nonagle) int nonagle)
{ {
struct tcp_sock *tp = tcp_sk(sk);
if (tcp_send_head(sk)) { if (tcp_send_head(sk)) {
struct sk_buff *skb = tcp_write_queue_tail(sk); struct tcp_sock *tp = tcp_sk(sk);
if (!(flags & MSG_MORE) || forced_push(tp)) if (!(flags & MSG_MORE) || forced_push(tp))
tcp_mark_push(tp, skb); tcp_mark_push(tp, tcp_write_queue_tail(sk));
tcp_mark_urg(tp, flags, skb);
tcp_mark_urg(tp, flags);
__tcp_push_pending_frames(sk, mss_now, __tcp_push_pending_frames(sk, mss_now,
(flags & MSG_MORE) ? TCP_NAGLE_CORK : nonagle); (flags & MSG_MORE) ? TCP_NAGLE_CORK : nonagle);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment