Merge tag 'v3.8-rc3' into v4l_for_linus

Linux 3.8-rc3

* tag 'v3.8-rc3': (11110 commits)
  Linux 3.8-rc3
  mm: reinstante dropped pmd_trans_splitting() check
  cred: Remove tgcred pointer from struct cred
  drm/ttm: fix fence locking in ttm_buffer_object_transfer
  ARM: clps711x: Fix bad merge of clockevents setup
  ARM: highbank: save and restore L2 cache and GIC on suspend
  ARM: highbank: add a power request clear
  ARM: highbank: fix secondary boot and hotplug
  ARM: highbank: fix typos with hignbank in power request functions
  ARM: dts: fix highbank cpu mpidr values
  ARM: dts: add device_type prop to cpu nodes on Calxeda platforms
  drm/prime: drop reference on imported dma-buf come from gem
  xen/netfront: improve truesize tracking
  ARM: mx5: Fix MX53 flexcan2 clock
  ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array
  sctp: fix Kconfig bug in default cookie hmac selection
  EDAC: Cleanup device deregistering path
  EDAC: Fix EDAC Kconfig menu
  EDAC: Fix kernel panic on module unloading
  ALSA: hda - add mute LED for HP Pavilion 17 (Realtek codec)
  ...

1 files changed, 10 insertions, 13 deletions

diff --git a/net/batman-adv/bitarray.c b/net/batman-adv/bitarray.c
index aea174cdbfbd..5453b17d8df2 100644
--- a/net/batman-adv/bitarray.c
+++ b/net/batman-adv/bitarray.c
@@ -79,20 +79,17 @@ int batadv_bit_get_packet(void *priv, unsigned long *seq_bits,
          * or the old packet got delayed somewhere in the network. The
          * packet should be dropped without calling this function if the
          * seqno window is protected.
+         *
+         * seq_num_diff <= -BATADV_TQ_LOCAL_WINDOW_SIZE
+         * or
+         * seq_num_diff >= BATADV_EXPECTED_SEQNO_RANGE
          */
-        if (seq_num_diff <= -BATADV_TQ_LOCAL_WINDOW_SIZE ||
-            seq_num_diff >= BATADV_EXPECTED_SEQNO_RANGE) {
+        batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                   "Other host probably restarted!\n");
 
-                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
-                           "Other host probably restarted!\n");
-
-                bitmap_zero(seq_bits, BATADV_TQ_LOCAL_WINDOW_SIZE);
-                if (set_mark)
-                        batadv_set_bit(seq_bits, 0);
-
-                return 1;
-        }
+        bitmap_zero(seq_bits, BATADV_TQ_LOCAL_WINDOW_SIZE);
+        if (set_mark)
+                batadv_set_bit(seq_bits, 0);
 
-        /* never reached */
-        return 0;
+        return 1;
 }