Commit 2aa72f61 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (35 commits)
  NET: SB1250: Initialize .owner
  vxge: show startup message with KERN_INFO
  ll_temac: Fix missing iounmaps
  bridge: Clear IPCB before possible entry into IP stack
  bridge br_multicast: BUG: unable to handle kernel NULL pointer dereference
  net: Fix definition of netif_vdbg() when VERBOSE_DEBUG is defined
  net/ne: fix memory leak in ne_drv_probe()
  xfrm: fix xfrm by MARK logic
  virtio_net: fix oom handling on tx
  virtio_net: do not reschedule rx refill forever
  s2io: resolve statistics issues
  linux/net.h: fix kernel-doc warnings
  net: decreasing real_num_tx_queues needs to flush qdisc
  sched: qdisc_reset_all_tx is calling qdisc_reset without qdisc_lock
  qlge: fix a eeh handler to not add a pending timer
  qlge: Replacing add_timer() to mod_timer()
  usbnet: Set parent device early for netdev_printk()
  net: Revert "rndis_host: Poll status channel before control channel"
  netfilter: ip6t_REJECT: fix a dst leak in ipv6 REJECT
  drivers: bluetooth: bluecard_cs.c: Fixed include error, changed to linux/io.h
  ...
parents 78178c7d 33b665ee

drivers/bluetooth/bluecard_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include <linux/wait.h>



#include <linux/skbuff.h>

#include <asm/io.h>

#include <linux/io.h>



#include <pcmcia/cs_types.h>

#include <pcmcia/cs.h>

drivers/bluetooth/hci_bcsp.c

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ static struct sk_buff *bcsp_prepare_pkt(struct bcsp_struct *bcsp, u8 *data, 
	if (rel) {

		hdr[0] |= 0x80 + bcsp->msgq_txseq;

		BT_DBG("Sending packet with seqno %u", bcsp->msgq_txseq);

		bcsp->msgq_txseq = ++(bcsp->msgq_txseq) & 0x07;

		bcsp->msgq_txseq = (bcsp->msgq_txseq + 1) & 0x07;

	}



	if (bcsp->use_crc)

drivers/net/bonding/bond_alb.c

+2 −1
Original line number Diff line number Diff line
@@ -340,7 +340,8 @@ static void rlb_update_entry_from_arp(struct bonding *bond, struct arp_pkt *arp) 


	if ((client_info->assigned) &&

	    (client_info->ip_src == arp->ip_dst) &&

	    (client_info->ip_dst == arp->ip_src)) {

	    (client_info->ip_dst == arp->ip_src) &&

	    (compare_ether_addr_64bits(client_info->mac_dst, arp->mac_src))) {

		/* update the clients MAC address */

		memcpy(client_info->mac_dst, arp->mac_src, ETH_ALEN);

		client_info->ntt = 1;

drivers/net/bonding/bond_main.c

+22 −11
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static int arp_ip_count; 
static int bond_mode	= BOND_MODE_ROUNDROBIN;

static int xmit_hashtype = BOND_XMIT_POLICY_LAYER2;

static int lacp_fast;



static int disable_netpoll = 1;



const struct bond_parm_tbl bond_lacp_tbl[] = {

{	"slow",		AD_LACP_SLOW},
@@ -1742,6 +1742,13 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) 
	bond_set_carrier(bond);



#ifdef CONFIG_NET_POLL_CONTROLLER

	/*

	 * Netpoll and bonding is broken, make sure it is not initialized

	 * until it is fixed.

	 */

	if (disable_netpoll) {

		bond_dev->priv_flags |= IFF_DISABLE_NETPOLL;

	} else {

		if (slaves_support_netpoll(bond_dev)) {

			bond_dev->priv_flags &= ~IFF_DISABLE_NETPOLL;

			if (bond_dev->npinfo)
@@ -1752,6 +1759,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) 
				slave_dev->name);

			pr_info("Disabling netpoll support for %s\n", bond_dev->name);

		}

	}

#endif

	read_unlock(&bond->lock);
@@ -1950,6 +1958,9 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev) 


#ifdef CONFIG_NET_POLL_CONTROLLER

	read_lock_bh(&bond->lock);



	 /* Make sure netpoll over stays disabled until fixed. */

	if (!disable_netpoll)

		if (slaves_support_netpoll(bond_dev))

				bond_dev->priv_flags &= ~IFF_DISABLE_NETPOLL;

	read_unlock_bh(&bond->lock);

drivers/net/ixgbe/ixgbe_main.c

+10 −7
Original line number Diff line number Diff line
@@ -3684,10 +3684,6 @@ void ixgbe_down(struct ixgbe_adapter *adapter) 
	/* signal that we are down to the interrupt handler */

	set_bit(__IXGBE_DOWN, &adapter->state);



	/* power down the optics */

	if (hw->phy.multispeed_fiber)

		hw->mac.ops.disable_tx_laser(hw);



	/* disable receive for all VFs and wait one second */

	if (adapter->num_vfs) {

		/* ping all the active vfs to let them know we are going down */
@@ -3742,6 +3738,10 @@ void ixgbe_down(struct ixgbe_adapter *adapter) 
		                (IXGBE_READ_REG(hw, IXGBE_DMATXCTL) &

		                 ~IXGBE_DMATXCTL_TE));



	/* power down the optics */

	if (hw->phy.multispeed_fiber)

		hw->mac.ops.disable_tx_laser(hw);



	/* clear n-tuple filters that are cached */

	ethtool_ntuple_flush(netdev);
@@ -4001,7 +4001,7 @@ static void ixgbe_set_num_queues(struct ixgbe_adapter *adapter) 


done:

	/* Notify the stack of the (possibly) reduced Tx Queue count. */

	adapter->netdev->real_num_tx_queues = adapter->num_tx_queues;

	netif_set_real_num_tx_queues(adapter->netdev, adapter->num_tx_queues);

}



static void ixgbe_acquire_msix_vectors(struct ixgbe_adapter *adapter,
@@ -5195,7 +5195,6 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake) 
		ixgbe_free_all_tx_resources(adapter);

		ixgbe_free_all_rx_resources(adapter);

	}

	ixgbe_clear_interrupt_scheme(adapter);



#ifdef CONFIG_PM

	retval = pci_save_state(pdev);
@@ -5230,6 +5229,8 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake) 


	*enable_wake = !!wufc;



	ixgbe_clear_interrupt_scheme(adapter);



	ixgbe_release_hw_control(adapter);



	pci_disable_device(pdev);
@@ -6023,7 +6024,6 @@ static void ixgbe_tx_queue(struct ixgbe_adapter *adapter, 
static void ixgbe_atr(struct ixgbe_adapter *adapter, struct sk_buff *skb,

	              int queue, u32 tx_flags)

{

	/* Right now, we support IPv4 only */

	struct ixgbe_atr_input atr_input;

	struct tcphdr *th;

	struct iphdr *iph = ip_hdr(skb);
@@ -6032,6 +6032,9 @@ static void ixgbe_atr(struct ixgbe_adapter *adapter, struct sk_buff *skb, 
	u32 src_ipv4_addr, dst_ipv4_addr;

	u8 l4type = 0;



	/* Right now, we support IPv4 only */

	if (skb->protocol != htons(ETH_P_IP))

		return;

	/* check if we're UDP or TCP */

	if (iph->protocol == IPPROTO_TCP) {

		th = tcp_hdr(skb);

CRA Git | Maintained and supported by SUSTech CRA and CCSE