Merge commit 'origin/master' into next

Manual merge of:
	arch/powerpc/include/asm/elf.h
	drivers/i2c/busses/i2c-mpc.c

1 files changed, 11 insertions, 12 deletions

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index fe77e1499ab7..9d5078bd23a3 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -69,16 +69,16 @@ union tcp_word_hdr {
 #define tcp_flag_word(tp) ( ((union tcp_word_hdr *)(tp))->words [3]) 
 
 enum { 
-        TCP_FLAG_CWR = __constant_htonl(0x00800000), 
-        TCP_FLAG_ECE = __constant_htonl(0x00400000), 
-        TCP_FLAG_URG = __constant_htonl(0x00200000), 
-        TCP_FLAG_ACK = __constant_htonl(0x00100000), 
-        TCP_FLAG_PSH = __constant_htonl(0x00080000), 
-        TCP_FLAG_RST = __constant_htonl(0x00040000), 
-        TCP_FLAG_SYN = __constant_htonl(0x00020000), 
-        TCP_FLAG_FIN = __constant_htonl(0x00010000),
-        TCP_RESERVED_BITS = __constant_htonl(0x0F000000),
-        TCP_DATA_OFFSET = __constant_htonl(0xF0000000)
+        TCP_FLAG_CWR = __cpu_to_be32(0x00800000),
+        TCP_FLAG_ECE = __cpu_to_be32(0x00400000),
+        TCP_FLAG_URG = __cpu_to_be32(0x00200000),
+        TCP_FLAG_ACK = __cpu_to_be32(0x00100000),
+        TCP_FLAG_PSH = __cpu_to_be32(0x00080000),
+        TCP_FLAG_RST = __cpu_to_be32(0x00040000),
+        TCP_FLAG_SYN = __cpu_to_be32(0x00020000),
+        TCP_FLAG_FIN = __cpu_to_be32(0x00010000),
+        TCP_RESERVED_BITS = __cpu_to_be32(0x0F000000),
+        TCP_DATA_OFFSET = __cpu_to_be32(0xF0000000)
 }; 
 
 /* TCP socket options */
@@ -218,7 +218,6 @@ struct tcp_options_received {
                 snd_wscale : 4, /* Window scaling received from sender  */
                 rcv_wscale : 4; /* Window scaling to send to receiver   */
 /*      SACKs data      */
-        u8      eff_sacks;      /* Size of SACK array to send with next packet */
         u8      num_sacks;      /* Number of SACK blocks                */
         u16     user_mss;       /* mss requested by user in ioctl */
         u16     mss_clamp;      /* Maximal mss, negotiated at connection setup */
@@ -249,7 +248,7 @@ struct tcp_sock {
         /* inet_connection_sock has to be the first member of tcp_sock */
         struct inet_connection_sock     inet_conn;
         u16     tcp_header_len; /* Bytes of tcp header to send          */
-        u16     xmit_size_goal; /* Goal for segmenting output packets   */
+        u16     xmit_size_goal_segs; /* Goal for segmenting output packets */
 
 /*
  *      Header prediction flags