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

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

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



Conflicts:
	net/batman-adv/bridge_loop_avoidance.c
	net/batman-adv/bridge_loop_avoidance.h
	net/batman-adv/soft-interface.c
	net/mac80211/mlme.c

With merge help from Antonio Quartulli (batman-adv) and
Stephen Rothwell (drivers/net/usb/qmi_wwan.c).

The net/mac80211/mlme.c conflict seemed easy enough, accounting for a
conversion to some new tracing macros.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c278fa53 c1f5163d

drivers/infiniband/ulp/ipoib/ipoib_ib.c

+8 −4
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static void ipoib_ud_skb_put_frags(struct ipoib_dev_priv *priv, 


		skb_frag_size_set(frag, size);

		skb->data_len += size;

		skb->truesize += size;

		skb->truesize += PAGE_SIZE;

	} else

		skb_put(skb, length);
@@ -156,14 +156,18 @@ static struct sk_buff *ipoib_alloc_rx_skb(struct net_device *dev, int id) 
	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct sk_buff *skb;

	int buf_size;

	int tailroom;

	u64 *mapping;



	if (ipoib_ud_need_sg(priv->max_ib_mtu))

	if (ipoib_ud_need_sg(priv->max_ib_mtu)) {

		buf_size = IPOIB_UD_HEAD_SIZE;

	else

		tailroom = 128; /* reserve some tailroom for IP/TCP headers */

	} else {

		buf_size = IPOIB_UD_BUF_SIZE(priv->max_ib_mtu);

		tailroom = 0;

	}



	skb = dev_alloc_skb(buf_size + 4);

	skb = dev_alloc_skb(buf_size + tailroom + 4);

	if (unlikely(!skb))

		return NULL;

drivers/isdn/mISDN/stack.c

+2 −2
Original line number Diff line number Diff line
@@ -135,8 +135,8 @@ send_layer2(struct mISDNstack *st, struct sk_buff *skb) 
			skb = NULL;

		else if (*debug & DEBUG_SEND_ERR)

			printk(KERN_DEBUG

			       "%s ch%d mgr prim(%x) addr(%x) err %d\n",

			       __func__, ch->nr, hh->prim, ch->addr, ret);

			       "%s mgr prim(%x) err %d\n",

			       __func__, hh->prim, ret);

	}

out:

	mutex_unlock(&st->lmutex);

drivers/net/bonding/bond_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#include "bonding.h"

#include "bond_alb.h"



#ifdef CONFIG_DEBUG_FS

#if defined(CONFIG_DEBUG_FS) && !defined(CONFIG_NET_NS)



#include <linux/debugfs.h>

#include <linux/seq_file.h>

drivers/net/bonding/bond_main.c

+6 −3
Original line number Diff line number Diff line
@@ -3230,6 +3230,12 @@ static int bond_master_netdev_event(unsigned long event, 
	switch (event) {

	case NETDEV_CHANGENAME:

		return bond_event_changename(event_bond);

	case NETDEV_UNREGISTER:

		bond_remove_proc_entry(event_bond);

		break;

	case NETDEV_REGISTER:

		bond_create_proc_entry(event_bond);

		break;

	default:

		break;

	}
@@ -4414,8 +4420,6 @@ static void bond_uninit(struct net_device *bond_dev) 


	bond_work_cancel_all(bond);



	bond_remove_proc_entry(bond);



	bond_debug_unregister(bond);



	__hw_addr_flush(&bond->mc_list);
@@ -4817,7 +4821,6 @@ static int bond_init(struct net_device *bond_dev) 


	bond_set_lockdep_class(bond_dev);



	bond_create_proc_entry(bond);

	list_add_tail(&bond->bond_list, &bn->dev_list);



	bond_prepare_sysfs_group(bond);

drivers/net/ethernet/atheros/atl1c/atl1c_main.c

+0 −1
Original line number Diff line number Diff line
@@ -261,7 +261,6 @@ static void atl1c_check_link_status(struct atl1c_adapter *adapter) 
	if ((phy_data & BMSR_LSTATUS) == 0) {

		/* link down */

		netif_carrier_off(netdev);

		netif_stop_queue(netdev);

		hw->hibernate = true;

		if (atl1c_reset_mac(hw) != 0)

			if (netif_msg_hw(adapter))