please pull infiniband.git
Linus, please pull from
master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This tree is also available from kernel.org mirrors at:
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
Chien Tung (1):
RDMA/nes: Fix MSS calculation on RDMA path
drivers/infiniband/hw/nes/nes_cm.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/infiniband/hw/nes/nes_cm.c +2 -1
@@ -40,6 +40,7 @@#include <linux/tcp.h> #include <linux/init.h> #include <linux/if_arp.h> +#include <linux/if_vlan.h> #include <linux/notifier.h> #include <linux/net.h> #include <linux/types.h>
@@ -1072,7 +1073,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core, ts =current_kernel_time (); cm_node->tcp_cntxt.loc_seq_num =htonl (ts.tv_nsec); cm_node->tcp_cntxt.mss = nesvnic->max_frame_size -sizeof (struct iphdr ) - -sizeof (struct tcphdr ) -ETH_HLEN ; +sizeof (struct tcphdr ) -ETH_HLEN -VLAN_HLEN ; cm_node->tcp_cntxt.rcv_nxt =0 ;/* get a unique session ID , add thread_id to an upcounter to handle race */ atomic_inc (&cm_core->node_cnt);