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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (47 commits)
  rose: Wrong list_lock argument in rose_node seqops
  netns: Fix reassembly timer to use the right namespace
  netns: Fix device renaming for sysfs
  bnx2: Update version to 1.7.5.
  bnx2: Update RV2P firmware for 5709.
  bnx2: Zero out context memory for 5709.
  bnx2: Fix register test on 5709.
  bnx2: Fix remote PHY initial link state.
  bnx2: Refine remote PHY locking.
  bridge: forwarding table information for >256 devices
  tg3: Update version to 3.92
  tg3: Add link state reporting to UMP firmware
  tg3: Fix ethtool loopback test for 5761 BX devices
  tg3: Fix 5761 NVRAM sizes
  tg3: Use constant 500KHz MI clock on adapters with a CPMU
  hci_usb.h: fix hard-to-trigger race
  dccp: ccid2.c, ccid3.c use clamp(), clamp_t()
  net: remove NR_CPUS arrays in net/core/dev.c
  net: use get/put_unaligned_* helpers
  bluetooth: use get/put_unaligned_* helpers
  ...

1 files changed, 9 insertions, 9 deletions

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 0298f80681f2..eda4f4a233f3 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -1172,8 +1172,8 @@ static int tcp_check_dsack(struct tcp_sock *tp, struct sk_buff *ack_skb,
                            struct tcp_sack_block_wire *sp, int num_sacks,
                            u32 prior_snd_una)
 {
-        u32 start_seq_0 = ntohl(get_unaligned(&sp[0].start_seq));
-        u32 end_seq_0 = ntohl(get_unaligned(&sp[0].end_seq));
+        u32 start_seq_0 = get_unaligned_be32(&sp[0].start_seq);
+        u32 end_seq_0 = get_unaligned_be32(&sp[0].end_seq);
         int dup_sack = 0;
 
         if (before(start_seq_0, TCP_SKB_CB(ack_skb)->ack_seq)) {
@@ -1181,8 +1181,8 @@ static int tcp_check_dsack(struct tcp_sock *tp, struct sk_buff *ack_skb,
                 tcp_dsack_seen(tp);
                 NET_INC_STATS_BH(LINUX_MIB_TCPDSACKRECV);
         } else if (num_sacks > 1) {
-                u32 end_seq_1 = ntohl(get_unaligned(&sp[1].end_seq));
-                u32 start_seq_1 = ntohl(get_unaligned(&sp[1].start_seq));
+                u32 end_seq_1 = get_unaligned_be32(&sp[1].end_seq);
+                u32 start_seq_1 = get_unaligned_be32(&sp[1].start_seq);
 
                 if (!after(end_seq_0, end_seq_1) &&
                     !before(start_seq_0, start_seq_1)) {
@@ -1453,8 +1453,8 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb,
         for (i = 0; i < num_sacks; i++) {
                 int dup_sack = !i && found_dup_sack;
 
-                sp[used_sacks].start_seq = ntohl(get_unaligned(&sp_wire[i].start_seq));
-                sp[used_sacks].end_seq = ntohl(get_unaligned(&sp_wire[i].end_seq));
+                sp[used_sacks].start_seq = get_unaligned_be32(&sp_wire[i].start_seq);
+                sp[used_sacks].end_seq = get_unaligned_be32(&sp_wire[i].end_seq);
 
                 if (!tcp_is_sackblock_valid(tp, dup_sack,
                                             sp[used_sacks].start_seq,
@@ -3340,7 +3340,7 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
                         switch (opcode) {
                         case TCPOPT_MSS:
                                 if (opsize == TCPOLEN_MSS && th->syn && !estab) {
-                                        u16 in_mss = ntohs(get_unaligned((__be16 *)ptr));
+                                        u16 in_mss = get_unaligned_be16(ptr);
                                         if (in_mss) {
                                                 if (opt_rx->user_mss &&
                                                     opt_rx->user_mss < in_mss)
@@ -3369,8 +3369,8 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
                                     ((estab && opt_rx->tstamp_ok) ||
                                      (!estab && sysctl_tcp_timestamps))) {
                                         opt_rx->saw_tstamp = 1;
-                                        opt_rx->rcv_tsval = ntohl(get_unaligned((__be32 *)ptr));
-                                        opt_rx->rcv_tsecr = ntohl(get_unaligned((__be32 *)(ptr+4)));
+                                        opt_rx->rcv_tsval = get_unaligned_be32(ptr);
+                                        opt_rx->rcv_tsecr = get_unaligned_be32(ptr + 4);
                                 }
                                 break;
                         case TCPOPT_SACK_PERM: