diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-22 17:07:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-22 17:07:59 -0700 |
| commit | d2532dd20a126020de407c1c2476a75b53fce7ac (patch) | |
| tree | 82606654f8eda64fef397d115b09567c3c751247 /drivers | |
| parent | 7f8ed1855d7f23eb5fa1b5d2f890b748ecf95179 (diff) | |
| parent | f2b2b59b93082d02ee5ec8fda4ed94f498551a47 (diff) | |
| download | linux-3.10-d2532dd20a126020de407c1c2476a75b53fce7ac.tar.gz linux-3.10-d2532dd20a126020de407c1c2476a75b53fce7ac.tar.bz2 linux-3.10-d2532dd20a126020de407c1c2476a75b53fce7ac.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
RDMA/nes: Fix MSS calculation on RDMA path
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_cm.c | 3 |
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 39adb267fb1..0bef878e0f6 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); |