Commit 43b03f1f 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:
	MAINTAINERS
	drivers/net/wireless/iwlwifi/pcie/trans.c

The iwlwifi conflict was resolved by keeping the code added
in 'net' that turns off the buggy chip feature.

The MAINTAINERS conflict was merely overlapping changes, one
change updated all the wireless web site URLs and the other
changed some GIT trees to be Johannes's instead of John's.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2da45db2 5ee31c68

MAINTAINERS

+10 −2
Original line number Diff line number Diff line
@@ -1800,6 +1800,9 @@ F: include/linux/cfag12864b.h 
CFG80211 and NL80211

M:	Johannes Berg <johannes@sipsolutions.net>

L:	linux-wireless@vger.kernel.org

W:	http://wireless.kernel.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git

S:	Maintained

F:	include/linux/nl80211.h

F:	include/net/cfg80211.h
@@ -4340,7 +4343,8 @@ MAC80211 
M:	Johannes Berg <johannes@sipsolutions.net>

L:	linux-wireless@vger.kernel.org

W:	http://wireless.kernel.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git

S:	Maintained

F:	Documentation/networking/mac80211-injection.txt

F:	include/net/mac80211.h
@@ -4351,7 +4355,8 @@ M: Stefano Brivio <stefano.brivio@polimi.it> 
M:	Mattias Nissler <mattias.nissler@gmx.de>

L:	linux-wireless@vger.kernel.org

W:	http://wireless.kernel.org/en/developers/Documentation/mac80211/RateControl/PID

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git

S:	Maintained

F:	net/mac80211/rc80211_pid*
@@ -5695,6 +5700,9 @@ F: include/linux/remoteproc.h 
RFKILL

M:	Johannes Berg <johannes@sipsolutions.net>

L:	linux-wireless@vger.kernel.org

W:	http://wireless.kernel.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git

S:	Maintained

F:	Documentation/rfkill.txt

F:	net/rfkill/

drivers/bcma/driver_pci.c

+4 −2
Original line number Diff line number Diff line
@@ -232,17 +232,19 @@ void __devinit bcma_core_pci_init(struct bcma_drv_pci *pc) 
int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc, struct bcma_device *core,

			  bool enable)

{

	struct pci_dev *pdev = pc->core->bus->host_pci;

	struct pci_dev *pdev;

	u32 coremask, tmp;

	int err = 0;



	if (core->bus->hosttype != BCMA_HOSTTYPE_PCI) {

	if (!pc || core->bus->hosttype != BCMA_HOSTTYPE_PCI) {

		/* This bcma device is not on a PCI host-bus. So the IRQs are

		 * not routed through the PCI core.

		 * So we must not enable routing through the PCI core. */

		goto out;

	}



	pdev = pc->core->bus->host_pci;



	err = pci_read_config_dword(pdev, BCMA_PCI_IRQMASK, &tmp);

	if (err)

		goto out;

drivers/net/bonding/bond_main.c

+5 −4
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ 
#include <net/route.h>

#include <net/net_namespace.h>

#include <net/netns/generic.h>

#include <net/pkt_sched.h>

#include "bonding.h"

#include "bond_3ad.h"

#include "bond_alb.h"
@@ -381,8 +382,6 @@ struct vlan_entry *bond_next_vlan(struct bonding *bond, struct vlan_entry *curr) 
	return next;

}



#define bond_queue_mapping(skb) (*(u16 *)((skb)->cb))



/**

 * bond_dev_queue_xmit - Prepare skb for xmit.

 *
@@ -395,7 +394,9 @@ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, 
{

	skb->dev = slave_dev;



	skb->queue_mapping = bond_queue_mapping(skb);

	BUILD_BUG_ON(sizeof(skb->queue_mapping) !=

		     sizeof(qdisc_skb_cb(skb)->bond_queue_mapping));

	skb->queue_mapping = qdisc_skb_cb(skb)->bond_queue_mapping;



	if (unlikely(netpoll_tx_running(slave_dev)))

		bond_netpoll_send_skb(bond_get_slave_by_dev(bond, slave_dev), skb);
@@ -4174,7 +4175,7 @@ static u16 bond_select_queue(struct net_device *dev, struct sk_buff *skb) 
	/*

	 * Save the original txq to restore before passing to the driver

	 */

	bond_queue_mapping(skb) = skb->queue_mapping;

	qdisc_skb_cb(skb)->bond_queue_mapping = skb->queue_mapping;



	if (unlikely(txq >= dev->real_num_tx_queues)) {

		do {

drivers/net/bonding/bond_sysfs.c

+6 −2
Original line number Diff line number Diff line
@@ -1082,8 +1082,12 @@ static ssize_t bonding_store_primary(struct device *d, 
		}

	}



	pr_info("%s: Unable to set %.*s as primary slave.\n",

		bond->dev->name, (int)strlen(buf) - 1, buf);

	strncpy(bond->params.primary, ifname, IFNAMSIZ);

	bond->params.primary[IFNAMSIZ - 1] = 0;



	pr_info("%s: Recording %s as primary, "

		"but it has not been enslaved to %s yet.\n",

		bond->dev->name, ifname, bond->dev->name);

out:

	write_unlock_bh(&bond->curr_slave_lock);

	read_unlock(&bond->lock);

drivers/net/dummy.c

+3 −1
Original line number Diff line number Diff line
@@ -187,8 +187,10 @@ static int __init dummy_init_module(void) 
	rtnl_lock();

	err = __rtnl_link_register(&dummy_link_ops);



	for (i = 0; i < numdummies && !err; i++)

	for (i = 0; i < numdummies && !err; i++) {

		err = dummy_init_one();

		cond_resched();

	}

	if (err < 0)

		__rtnl_link_unregister(&dummy_link_ops);

	rtnl_unlock();

CRA Git | Maintained and supported by SUSTech CRA and CCSE