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

Commit 296b6010 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 



Jesse Gross says:

====================
A few different bug fixes, including several for issues with userspace
communication that have gone unnoticed up until now.  These are intended
for net/3.9.
====================

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

net/openvswitch/actions.c

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static int __pop_vlan_tci(struct sk_buff *skb, __be16 *current_tci) 


	if (skb->ip_summed == CHECKSUM_COMPLETE)

		skb->csum = csum_sub(skb->csum, csum_partial(skb->data

					+ ETH_HLEN, VLAN_HLEN, 0));

					+ (2 * ETH_ALEN), VLAN_HLEN, 0));



	vhdr = (struct vlan_hdr *)(skb->data + ETH_HLEN);

	*current_tci = vhdr->h_vlan_TCI;
@@ -115,7 +115,7 @@ static int push_vlan(struct sk_buff *skb, const struct ovs_action_push_vlan *vla 


		if (skb->ip_summed == CHECKSUM_COMPLETE)

			skb->csum = csum_add(skb->csum, csum_partial(skb->data

					+ ETH_HLEN, VLAN_HLEN, 0));

					+ (2 * ETH_ALEN), VLAN_HLEN, 0));



	}

	__vlan_hwaccel_put_tag(skb, ntohs(vlan->vlan_tci) & ~VLAN_TAG_PRESENT);

net/openvswitch/datapath.c

+3 −0
Original line number Diff line number Diff line
@@ -394,6 +394,7 @@ static int queue_userspace_packet(struct net *net, int dp_ifindex, 


	skb_copy_and_csum_dev(skb, nla_data(nla));



	genlmsg_end(user_skb, upcall);

	err = genlmsg_unicast(net, user_skb, upcall_info->portid);



out:
@@ -1690,6 +1691,7 @@ static int ovs_vport_cmd_new(struct sk_buff *skb, struct genl_info *info) 
	if (IS_ERR(vport))

		goto exit_unlock;



	err = 0;

	reply = ovs_vport_cmd_build_info(vport, info->snd_portid, info->snd_seq,

					 OVS_VPORT_CMD_NEW);

	if (IS_ERR(reply)) {
@@ -1771,6 +1773,7 @@ static int ovs_vport_cmd_del(struct sk_buff *skb, struct genl_info *info) 
	if (IS_ERR(reply))

		goto exit_unlock;



	err = 0;

	ovs_dp_detach_port(vport);



	genl_notify(reply, genl_info_net(info), info->snd_portid,

net/openvswitch/flow.c

+5 −1
Original line number Diff line number Diff line
@@ -482,7 +482,11 @@ static __be16 parse_ethertype(struct sk_buff *skb) 
		return htons(ETH_P_802_2);



	__skb_pull(skb, sizeof(struct llc_snap_hdr));



	if (ntohs(llc->ethertype) >= 1536)

		return llc->ethertype;



	return htons(ETH_P_802_2);

}



static int parse_icmpv6(struct sk_buff *skb, struct sw_flow_key *key,

net/openvswitch/vport-netdev.c

+1 −2
Original line number Diff line number Diff line
@@ -43,8 +43,7 @@ static void netdev_port_receive(struct vport *vport, struct sk_buff *skb) 


	/* Make our own copy of the packet.  Otherwise we will mangle the

	 * packet for anyone who came before us (e.g. tcpdump via AF_PACKET).

	 * (No one comes after us, since we tell handle_bridge() that we took

	 * the packet.) */

	 */

	skb = skb_share_check(skb, GFP_ATOMIC);

	if (unlikely(!skb))

		return;

net/openvswitch/vport.c

+1 −2
Original line number Diff line number Diff line
@@ -325,8 +325,7 @@ int ovs_vport_get_options(const struct vport *vport, struct sk_buff *skb) 
 * @skb: skb that was received

 *

 * Must be called with rcu_read_lock.  The packet cannot be shared and

 * skb->data should point to the Ethernet header.  The caller must have already

 * called compute_ip_summed() to initialize the checksumming fields.

 * skb->data should point to the Ethernet header.

 */

void ovs_vport_receive(struct vport *vport, struct sk_buff *skb)

{