diff --git a/[refs] b/[refs] index c05f5e7beceb..331d9e5c499c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 00bcd522ea0a62f5e2a9c6ad4924cbbd8d05b026 +refs/heads/master: 38a7ddffa4b79d7b1fbc9bf2fa82b21b72622858 diff --git a/trunk/include/net/tcp.h b/trunk/include/net/tcp.h index 438014d57610..8f26b28fb407 100644 --- a/trunk/include/net/tcp.h +++ b/trunk/include/net/tcp.h @@ -590,7 +590,6 @@ struct tcp_skb_cb { #define TCPCB_EVER_RETRANS 0x80 /* Ever retransmitted frame */ #define TCPCB_RETRANS (TCPCB_SACKED_RETRANS|TCPCB_EVER_RETRANS) - __u16 urg_ptr; /* Valid w/URG flags is set. */ __u32 ack_seq; /* Sequence number ACK'd */ };