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

Commit a45085f6 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch 



Two small openswitch fixes from Jesse Gross.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3ed71471 d04d3829

net/openvswitch/flow.c

+5 −9
Original line number Diff line number Diff line
@@ -702,16 +702,12 @@ int ovs_flow_extract(struct sk_buff *skb, u16 in_port, struct sw_flow_key *key, 
			/* We only match on the lower 8 bits of the opcode. */

			if (ntohs(arp->ar_op) <= 0xff)

				key->ip.proto = ntohs(arp->ar_op);



			if (key->ip.proto == ARPOP_REQUEST

					|| key->ip.proto == ARPOP_REPLY) {

			memcpy(&key->ipv4.addr.src, arp->ar_sip, sizeof(key->ipv4.addr.src));

			memcpy(&key->ipv4.addr.dst, arp->ar_tip, sizeof(key->ipv4.addr.dst));

			memcpy(key->ipv4.arp.sha, arp->ar_sha, ETH_ALEN);

			memcpy(key->ipv4.arp.tha, arp->ar_tha, ETH_ALEN);

			key_len = SW_FLOW_KEY_OFFSET(ipv4.arp);

		}

		}

	} else if (key->eth.type == htons(ETH_P_IPV6)) {

		int nh_len;             /* IPv6 Header + Extensions */

net/openvswitch/vport-netdev.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static int netdev_send(struct vport *vport, struct sk_buff *skb) 


	if (unlikely(packet_length(skb) > mtu && !skb_is_gso(skb))) {

		net_warn_ratelimited("%s: dropped over-mtu packet: %d > %d\n",

				     ovs_dp_name(vport->dp),

				     netdev_vport->dev->name,

				     packet_length(skb), mtu);

		goto error;

	}