Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68bf9f0b authored by Amerigo Wang's avatar Amerigo Wang Committed by David S. Miller
Browse files

pktgen: set different default min_pkt_size for different protocols 



ETH_ZLEN is too small for IPv6, so this default value is not
suitable.

Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarCong Wang <amwang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5aa8b572

net/core/pktgen.c

+20 −7
Original line number Diff line number Diff line
@@ -248,8 +248,8 @@ struct pktgen_dev { 
	int removal_mark;	/* non-zero => the device is marked for

				 * removal by worker thread */



	int min_pkt_size;	/* = ETH_ZLEN; */

	int max_pkt_size;	/* = ETH_ZLEN; */

	int min_pkt_size;

	int max_pkt_size;

	int pkt_overhead;	/* overhead for MPLS, VLANs, IPSEC etc */

	int nfrags;

	struct page *page;
@@ -2036,10 +2036,14 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev) 
	/* Set up Dest MAC */

	memcpy(&(pkt_dev->hh[0]), pkt_dev->dst_mac, ETH_ALEN);



	/* Set up pkt size */

	pkt_dev->cur_pkt_size = pkt_dev->min_pkt_size;



	if (pkt_dev->flags & F_IPV6) {

		if (pkt_dev->min_pkt_size == 0) {

			pkt_dev->min_pkt_size = 14 + sizeof(struct ipv6hdr)

						+ sizeof(struct udphdr)

						+ sizeof(struct pktgen_hdr)

						+ pkt_dev->pkt_overhead;

		}



		/*

		 * Skip this automatic address setting until locks or functions

		 * gets exported
@@ -2086,6 +2090,13 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev) 
		}

#endif

	} else {

		if (pkt_dev->min_pkt_size == 0) {

			pkt_dev->min_pkt_size = 14 + sizeof(struct iphdr)

						+ sizeof(struct udphdr)

						+ sizeof(struct pktgen_hdr)

						+ pkt_dev->pkt_overhead;

		}



		pkt_dev->saddr_min = 0;

		pkt_dev->saddr_max = 0;

		if (strlen(pkt_dev->src_min) == 0) {
@@ -2111,6 +2122,10 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev) 
		pkt_dev->daddr_max = in_aton(pkt_dev->dst_max);

	}

	/* Initialize current values. */

	pkt_dev->cur_pkt_size = pkt_dev->min_pkt_size;

	if (pkt_dev->min_pkt_size > pkt_dev->max_pkt_size)

		pkt_dev->max_pkt_size = pkt_dev->min_pkt_size;



	pkt_dev->cur_dst_mac_offset = 0;

	pkt_dev->cur_src_mac_offset = 0;

	pkt_dev->cur_saddr = pkt_dev->saddr_min;
@@ -3548,8 +3563,6 @@ static int pktgen_add_device(struct pktgen_thread *t, const char *ifname) 
	}



	pkt_dev->removal_mark = 0;

	pkt_dev->min_pkt_size = ETH_ZLEN;

	pkt_dev->max_pkt_size = ETH_ZLEN;

	pkt_dev->nfrags = 0;

	pkt_dev->delay = pg_delay_d;

	pkt_dev->count = pg_count_d;