Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

#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>

	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);