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

Commit 24e5992a authored by Gao Feng's avatar Gao Feng Committed by David S. Miller
Browse files

ipvlan: Eliminate duplicated codes with existing function 



The recv flow of ipvlan l2 mode performs as same as l3 mode for
non-multicast packet, so use the existing func ipvlan_handle_mode_l3
instead of these duplicated statements in non-multicast case.

Signed-off-by: default avatarGao Feng <gfree.wind@vip.163.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9454d930

drivers/net/ipvlan/ipvlan_core.c

+2 −11
Original line number Original line Diff line number Diff line
@@ -664,8 +664,6 @@ static rx_handler_result_t ipvlan_handle_mode_l2(struct sk_buff **pskb, 
	struct sk_buff *skb = *pskb;

	struct sk_buff *skb = *pskb;

	struct ethhdr *eth = eth_hdr(skb);

	struct ethhdr *eth = eth_hdr(skb);

	rx_handler_result_t ret = RX_HANDLER_PASS;

	rx_handler_result_t ret = RX_HANDLER_PASS;

	void *lyr3h;

	int addr_type;





	if (is_multicast_ether_addr(eth->h_dest)) {

	if (is_multicast_ether_addr(eth->h_dest)) {

		if (ipvlan_external_frame(skb, port)) {

		if (ipvlan_external_frame(skb, port)) {
@@ -683,15 +681,8 @@ static rx_handler_result_t ipvlan_handle_mode_l2(struct sk_buff **pskb, 
			}

			}

		}

		}

	} else {

	} else {

		struct ipvl_addr *addr;

		/* Perform like l3 mode for non-multicast packet */



		ret = ipvlan_handle_mode_l3(pskb, port);

		lyr3h = ipvlan_get_L3_hdr(port, skb, &addr_type);

		if (!lyr3h)

			return ret;



		addr = ipvlan_addr_lookup(port, lyr3h, addr_type, true);

		if (addr)

			ret = ipvlan_rcv_frame(addr, pskb, false);

	}

	}





	return ret;

	return ret;