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

Commit 37d96c28 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  caif: Fix BUG() with network namespaces
  net: make bonding slaves honour master's skb->priority
  net: Unlock sock before calling sk_free()
parents aa77677e 08613e46

drivers/net/bonding/bond_main.c

+0 −1
Original line number Diff line number Diff line
@@ -395,7 +395,6 @@ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, 
			struct net_device *slave_dev)

{

	skb->dev = slave_dev;

	skb->priority = 1;



	skb->queue_mapping = bond_queue_mapping(skb);

net/caif/caif_dev.c

+3 −2
Original line number Diff line number Diff line
@@ -212,8 +212,7 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what, 
	enum cfcnfg_phy_preference pref;

	enum cfcnfg_phy_type phy_type;

	struct cfcnfg *cfg;

	struct caif_device_entry_list *caifdevs =

	    caif_device_list(dev_net(dev));

	struct caif_device_entry_list *caifdevs;



	if (dev->type != ARPHRD_CAIF)

		return 0;
@@ -222,6 +221,8 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what, 
	if (cfg == NULL)

		return 0;



	caifdevs = caif_device_list(dev_net(dev));



	switch (what) {

	case NETDEV_REGISTER:

		caifd = caif_device_alloc(dev);

net/core/sock.c

+1 −0
Original line number Diff line number Diff line
@@ -1257,6 +1257,7 @@ struct sock *sk_clone(const struct sock *sk, const gfp_t priority) 
			/* It is still raw copy of parent, so invalidate

			 * destructor and make plain sk_free() */

			newsk->sk_destruct = NULL;

			bh_unlock_sock(newsk);

			sk_free(newsk);

			newsk = NULL;

			goto out;