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

Commit d69c5c2c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 

Pull networking fixes from David Miller:
 "The main purpose of this pull request is to fix up the erroneous
  bonding patch I applied last round.  I meant to apply v4 of the patch
  from Jiri but I applied v3 by accident.  Mea culpa.

  Also, eagle eyed Dan Carpenter noticed that openvswitch has one of
  those "X = alloc(); if (!Y)" mistakes, test the proper pointer
  instead."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  openvswitch: checking wrong variable in queue_userspace_packet()
  bonding: Fix LACPDU rx_dropped commit.
parents eea41aee 8aa51d64

drivers/net/bonding/bond_alb.c

+7 −5
Original line number Diff line number Diff line
@@ -342,26 +342,26 @@ static void rlb_update_entry_from_arp(struct bonding *bond, struct arp_pkt *arp) 
	_unlock_rx_hashtbl_bh(bond);

}



static void rlb_arp_recv(struct sk_buff *skb, struct bonding *bond,

static int rlb_arp_recv(struct sk_buff *skb, struct bonding *bond,

			 struct slave *slave)

{

	struct arp_pkt *arp;



	if (skb->protocol != cpu_to_be16(ETH_P_ARP))

		return;

		goto out;



	arp = (struct arp_pkt *) skb->data;

	if (!arp) {

		pr_debug("Packet has no ARP data\n");

		return;

		goto out;

	}



	if (!pskb_may_pull(skb, arp_hdr_len(bond->dev)))

		return;

		goto out;



	if (skb->len < sizeof(struct arp_pkt)) {

		pr_debug("Packet is too small to be an ARP\n");

		return;

		goto out;

	}



	if (arp->op_code == htons(ARPOP_REPLY)) {
@@ -369,6 +369,8 @@ static void rlb_arp_recv(struct sk_buff *skb, struct bonding *bond, 
		rlb_update_entry_from_arp(bond, arp);

		pr_debug("Server received an ARP Reply from client\n");

	}

out:

	return RX_HANDLER_ANOTHER;

}



/* Caller must hold bond lock for read */

drivers/net/bonding/bonding.h

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ struct bonding { 
	struct   slave *primary_slave;

	bool     force_primary;

	s32      slave_cnt; /* never change this value outside the attach/detach wrappers */

	void     (*recv_probe)(struct sk_buff *, struct bonding *,

	int     (*recv_probe)(struct sk_buff *, struct bonding *,

			       struct slave *);

	rwlock_t lock;

	rwlock_t curr_slave_lock;

net/openvswitch/datapath.c

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ static int queue_userspace_packet(int dp_ifindex, struct sk_buff *skb, 
			return -ENOMEM;



		nskb = __vlan_put_tag(nskb, vlan_tx_tag_get(nskb));

		if (!skb)

		if (!nskb)

			return -ENOMEM;



		nskb->vlan_tci = 0;