From 55b0c36dee141e4433d226784cee400251dc9d42 Mon Sep 17 00:00:00 2001
From: Or Kehati <ork@mellanox.com>
Date: Tue, 11 Aug 2015 12:32:28 +0300
Subject: [PATCH] issue: 321712 ****************** VMA 7.0.5
 *******************

Change-Id: If071ca7fec1856dffff828a4ad083ba2c77a6f7b
Signed-off-by: Or Kehati <ork@mellanox.com>
---
 README.txt   |  6 +++---
 configure.ac |  4 ++--
 journal.txt  | 29 +++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/README.txt b/README.txt
index 38250619c..52366cae4 100644
--- a/README.txt
+++ b/README.txt
@@ -96,11 +96,11 @@ VMA_LOG_FILE, VMA logs just those parameters whose value != default.
 
 Example:
  VMA INFO   : ---------------------------------------------------------------------------
- VMA INFO   : VMA_VERSION: 6.9.1-0
+ VMA INFO   : VMA_VERSION: 7.0.5-0
  VMA INFO   : Cmd Line: sockperf sr
- VMA INFO   : Current Time: Sun May 21 13:09:29 2015
+ VMA INFO   : Current Time: Tue Aug 11 12:09:29 2015
  VMA INFO   : Pid:  7256
- VMA INFO   : OFED Version: MLNX_OFED_LINUX-3.0-3.0.0:
+ VMA INFO   : OFED Version: MLNX_OFED_LINUX-3.1-0.0.2:
  VMA INFO   : Architecture: x86_64
  VMA INFO   : Node: r-sw-bolt4 
  VMA INFO   : ---------------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index bd9872ee2..287485c40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_PREREQ(2.59)
 #
 define([vma_ver_major], 7)
 define([vma_ver_minor], 0)
-define([vma_ver_revision], 4)
+define([vma_ver_revision], 5)
 define([vma_ver_release], 0)
 
 AC_INIT(libvma, [vma_ver_major.vma_ver_minor.vma_ver_revision], support@mellanox.com)
@@ -38,7 +38,7 @@ VMA_LIBRARY_MINOR=0
 AC_SUBST(VMA_LIBRARY_MINOR)
 
 #VMA_LIBRARY_REVISION-vma_ver_revision
-VMA_LIBRARY_REVISION=4
+VMA_LIBRARY_REVISION=5
 AC_SUBST(VMA_LIBRARY_REVISION)
 
 #VMA_LIBRARY_RELEASE-vma_ver_release
diff --git a/journal.txt b/journal.txt
index cdcf4bfc2..a21d71309 100644
--- a/journal.txt
+++ b/journal.txt
@@ -1,3 +1,32 @@
+Version 7.0.5-0:
+Date + Time 2015-8-11
+=======================
+Added:
+        - RM #561857 Support non-standard vlan names
+        - RM #564158 provide 'sysctl' services for the rest of VMA objects to access
+        - RM #557948 Option to avoid system calls on tcp fd
+        - RM #562770 improve connection establishment rate
+        - RM #582394 Support flow-steering priority scheme on ConnectX-4
+        - RM #587515 Adapt vma to ConnectX-4 send inline demands
+        - RM #531820 Modify the syn throttling feature
+
+Fixed:
+        - RM #565962 Wrong TCP backlog handling
+        - RM #349852 fix cubic congestion control algorithm
+        - RM #549313 neigh post_send_tcp, fix check buffer validity
+        - RM #559589 Close on exec for netlink sockets, to fix crash on exec
+        - RM #554834 Fix issue when tcp header bigger than packet length
+        - RM #575582 Wrong handling of TCP window scale option
+        - RM #575697 VMA can't send FIN while snd_buf is full
+        - RM #552441 fix a possible crash in case of multithread udp recvfrom
+        - RM #565588 fix SO_LINGER functionality different than OS
+        - RM #576497 for upstream RH7.2 look at interface dev_port and not dev_id
+        - RM #559317 Continue processing CQ for ready FD after failure on one of them
+        - RM #560899 tcp socket hang in syn_recv state
+        - RM #501206 fix SO_RCVBUF and SO_SNDBUF for TCP
+        - RM #581915 incorrect errno when giving getsockopt an invalid level value
+        - RM #588042 Adjust tcp receive window to the socket receive buffer size
+
 Version 7.0.4-0:
 Date + Time 2015-7-8
 =======================