Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (160 commits)
  [ETHTOOL]: Remove some entries from non-root command list.
  [Bluetooth]: Fix section mismatch of bt_sysfs_cleanup()
  [Bluetooth]: Don't update disconnect timer for incoming connections
  [ETHTOOL]: let mortals use ethtool
  [NetLabel]: add audit support for configuration changes
  [TCP]: Fix and simplify microsecond rtt sampling
  [TCP] tcp-lp: prevent chance for oops
  [SUNRPC]: Remove unnecessary check in net/sunrpc/svcsock.c
  [IPVS] bug: endianness breakage in ip_vs_ftp
  [IPVS]: ipvs annotations
  [NETFILTER]: h323 annotations
  [NETFILTER]: ipt annotations
  [NETFILTER]: NAT annotations
  [NETFILTER]: conntrack annotations
  [NETFILTER]: netfilter misc annotations
  [NET]: Annotate dst_ops protocol
  [NET]: is it Andy or Andi ??
  [IPVS]: Make sure ip_vs_ftp ports are valid: module_param_array approach
  [IPVS]: Reverse valid ip_vs_ftp ports fix: port check approach
  [IrDA] stir4200: removing undocumented bits handling
  ...

1 files changed, 14 insertions, 9 deletions

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 8ebf497907f8..0e058a2d1c6d 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -21,10 +21,10 @@
 #include <asm/byteorder.h>
 
 struct tcphdr {
-        __u16   source;
-        __u16   dest;
-        __u32   seq;
-        __u32   ack_seq;
+        __be16  source;
+        __be16  dest;
+        __be32  seq;
+        __be32  ack_seq;
 #if defined(__LITTLE_ENDIAN_BITFIELD)
         __u16   res1:4,
                 doff:4,
@@ -50,9 +50,9 @@ struct tcphdr {
 #else
 #error  "Adjust your <asm/byteorder.h> defines"
 #endif  
-        __u16   window;
-        __u16   check;
-        __u16   urg_ptr;
+        __be16  window;
+        __be16  check;
+        __be16  urg_ptr;
 };
 
 /*
@@ -62,7 +62,7 @@ struct tcphdr {
  */
 union tcp_word_hdr { 
         struct tcphdr hdr;
-        __u32             words[5];
+        __be32            words[5];
 }; 
 
 #define tcp_flag_word(tp) ( ((union tcp_word_hdr *)(tp))->words [3]) 
@@ -166,6 +166,11 @@ struct tcp_info
 #include <net/inet_timewait_sock.h>
 
 /* This defines a selective acknowledgement block. */
+struct tcp_sack_block_wire {
+        __be32  start_seq;
+        __be32  end_seq;
+};
+
 struct tcp_sack_block {
         __u32   start_seq;
         __u32   end_seq;
@@ -211,7 +216,7 @@ struct tcp_sock {
  *      Header prediction flags
  *      0x5?10 << 16 + snd_wnd in net byte order
  */
-        __u32   pred_flags;
+        __be32  pred_flags;
 
 /*
  *      RFC793 variables by their proper names. This means you can