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

Commit cedca418 authored by Linus Walleij's avatar Linus Walleij Committed by David S. Miller
Browse files

net: gemini: Look up L3 maxlen from table 



The code to calculate the hardware register enumerator
for the maximum L3 length isn't entirely simple to read.
Use the existing defines and rewrite the function into a
table look-up.

Acked-by: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 750c721e

drivers/net/ethernet/cortina/gemini.c

+46 −15
Original line number Diff line number Diff line
@@ -401,26 +401,57 @@ static int gmac_setup_phy(struct net_device *netdev) 
	return 0;

}



static int gmac_pick_rx_max_len(int max_l3_len)

/* The maximum frame length is not logically enumerated in the

 * hardware, so we do a table lookup to find the applicable max

 * frame length.

 */

struct gmac_max_framelen {

	unsigned int max_l3_len;

	u8 val;

};



static const struct gmac_max_framelen gmac_maxlens[] = {

	{

		.max_l3_len = 1518,

		.val = CONFIG0_MAXLEN_1518,

	},

	{

		.max_l3_len = 1522,

		.val = CONFIG0_MAXLEN_1522,

	},

	{

		.max_l3_len = 1536,

		.val = CONFIG0_MAXLEN_1536,

	},

	{

	/* index = CONFIG_MAXLEN_XXX values */

	static const int max_len[8] = {

		1536, 1518, 1522, 1542,

		9212, 10236, 1518, 1518

		.max_l3_len = 1542,

		.val = CONFIG0_MAXLEN_1542,

	},

	{

		.max_l3_len = 9212,

		.val = CONFIG0_MAXLEN_9k,

	},

	{

		.max_l3_len = 10236,

		.val = CONFIG0_MAXLEN_10k,

	},

};

	int i, n = 5;



	max_l3_len += ETH_HLEN + VLAN_HLEN;

static int gmac_pick_rx_max_len(unsigned int max_l3_len)

{

	const struct gmac_max_framelen *maxlen;

	int maxtot;

	int i;



	if (max_l3_len > max_len[n])

		return -1;

	maxtot = max_l3_len + ETH_HLEN + VLAN_HLEN;



	for (i = 0; i < 5; i++) {

		if (max_len[i] >= max_l3_len && max_len[i] < max_len[n])

			n = i;

	for (i = 0; i < ARRAY_SIZE(gmac_maxlens); i++) {

		maxlen = &gmac_maxlens[i];

		if (maxtot <= maxlen->max_l3_len)

			return maxlen->val;

	}



	return n;

	return -1;

}



static int gmac_init(struct net_device *netdev)