summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChien Tung <ctung@neteffect.com>2008-03-20 19:55:30 -0500
committerRoland Dreier <rolandd@cisco.com>2008-03-21 13:59:28 -0700
commitf2b2b59b93082d02ee5ec8fda4ed94f498551a47 (patch)
treede2f5566fc128dccdfe958f4b9b401989e820dfa
parentdba92d3bc49c036056a48661d2d8fefe4c78375a (diff)
downloadlinux-stable-f2b2b59b93082d02ee5ec8fda4ed94f498551a47.tar.gz
linux-stable-f2b2b59b93082d02ee5ec8fda4ed94f498551a47.tar.bz2
linux-stable-f2b2b59b93082d02ee5ec8fda4ed94f498551a47.zip
RDMA/nes: Fix MSS calculation on RDMA path
Fix the calculation of the MSS for RDMA connections: we need to allow space in frames for a VLAN tag too. Signed-off-by: Chien Tung <ctung@neteffect.com> Signed-off-by: Glenn Streiff <gstreiff@neteffect.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
-rw-r--r--drivers/infiniband/hw/nes/nes_cm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index 39adb267fb15..0bef878e0f65 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -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);