Commit 49b2de8e 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: (43 commits)
  net: Fix 'Re: PACKET_TX_RING: packet size is too long'
  netdev: usb: dm9601.c can drive a device not supported yet, add support for it
  qlge: Fix firmware mailbox command timeout.
  qlge: Fix EEH handling.
  AF_RAW: Augment raw_send_hdrinc to expand skb to fit iphdr->ihl (v2)
  bonding: fix a race condition in calls to slave MII ioctls
  virtio-net: fix data corruption with OOM
  sfc: Set ip_summed correctly for page buffers passed to GRO
  cnic: Fix L2CTX_STATUSB_NUM offset in context memory.
  MAINTAINERS: rt2x00 list is moderated
  airo: Reorder tests, check bounds before element
  mac80211: fix for incorrect sequence number on hostapd injected frames
  libertas spi: fix sparse errors
  mac80211: trivial: fix spelling in mesh_hwmp
  cfg80211: sme: deauthenticate on assoc failure
  mac80211: keep auth state when assoc fails
  mac80211: fix ibss joining
  b43: add 'struct b43_wl' missing declaration
  b43: Fix Bugzilla #14181 and the bug from the previous 'fix'
  rt2x00: Fix crypto in TX frame for rt2800usb
  ...
parents 8633322c b5dd884e

drivers/isdn/i4l/isdn_net.h

+3 −3
Original line number Diff line number Diff line
@@ -83,19 +83,19 @@ static __inline__ isdn_net_local * isdn_net_get_locked_lp(isdn_net_dev *nd) 


	spin_lock_irqsave(&nd->queue_lock, flags);

	lp = nd->queue;         /* get lp on top of queue */

	spin_lock(&nd->queue->xmit_lock);

	while (isdn_net_lp_busy(nd->queue)) {

		spin_unlock(&nd->queue->xmit_lock);

		nd->queue = nd->queue->next;

		if (nd->queue == lp) { /* not found -- should never happen */

			lp = NULL;

			goto errout;

		}

		spin_lock(&nd->queue->xmit_lock);

	}

	lp = nd->queue;

	nd->queue = nd->queue->next;

	spin_unlock_irqrestore(&nd->queue_lock, flags);

	spin_lock(&lp->xmit_lock);

	local_bh_disable();

	return lp;

errout:

	spin_unlock_irqrestore(&nd->queue_lock, flags);

	return lp;

drivers/net/au1000_eth.c

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
 *

 *

 */

#include <linux/capability.h>

#include <linux/dma-mapping.h>

#include <linux/module.h>

#include <linux/kernel.h>

drivers/net/bnx2.h

+6 −3
Original line number Diff line number Diff line
@@ -361,9 +361,12 @@ struct l2_fhdr { 
#define BNX2_L2CTX_CTX_TYPE_CTX_BD_CHN_TYPE_VALUE	 (1<<28)



#define BNX2_L2CTX_HOST_BDIDX				0x00000004

#define BNX2_L2CTX_STATUSB_NUM_SHIFT			 16

#define BNX2_L2CTX_STATUSB_NUM(sb_id)			 \

	(((sb_id) > 0) ? (((sb_id) + 7) << BNX2_L2CTX_STATUSB_NUM_SHIFT) : 0)

#define BNX2_L2CTX_L5_STATUSB_NUM_SHIFT			 16

#define BNX2_L2CTX_L2_STATUSB_NUM_SHIFT			 24

#define BNX2_L2CTX_L5_STATUSB_NUM(sb_id)		\

	(((sb_id) > 0) ? (((sb_id) + 7) << BNX2_L2CTX_L5_STATUSB_NUM_SHIFT) : 0)

#define BNX2_L2CTX_L2_STATUSB_NUM(sb_id)		\

	(((sb_id) > 0) ? (((sb_id) + 7) << BNX2_L2CTX_L2_STATUSB_NUM_SHIFT) : 0)

#define BNX2_L2CTX_HOST_BSEQ				0x00000008

#define BNX2_L2CTX_NX_BSEQ				0x0000000c

#define BNX2_L2CTX_NX_BDHADDR_HI			0x00000010

drivers/net/bonding/bond_main.c

+5 −5
Original line number Diff line number Diff line
@@ -691,7 +691,7 @@ static int bond_check_dev_link(struct bonding *bond, 
			       struct net_device *slave_dev, int reporting)

{

	const struct net_device_ops *slave_ops = slave_dev->netdev_ops;

	static int (*ioctl)(struct net_device *, struct ifreq *, int);

	int (*ioctl)(struct net_device *, struct ifreq *, int);

	struct ifreq ifr;

	struct mii_ioctl_data *mii;
@@ -3665,10 +3665,10 @@ static int bond_xmit_hash_policy_l23(struct sk_buff *skb, 


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

		return ((ntohl(iph->saddr ^ iph->daddr) & 0xffff) ^

			(data->h_dest[5] ^ bond_dev->dev_addr[5])) % count;

			(data->h_dest[5] ^ data->h_source[5])) % count;

	}



	return (data->h_dest[5] ^ bond_dev->dev_addr[5]) % count;

	return (data->h_dest[5] ^ data->h_source[5]) % count;

}



/*
@@ -3695,7 +3695,7 @@ static int bond_xmit_hash_policy_l34(struct sk_buff *skb, 


	}



	return (data->h_dest[5] ^ bond_dev->dev_addr[5]) % count;

	return (data->h_dest[5] ^ data->h_source[5]) % count;

}



/*
@@ -3706,7 +3706,7 @@ static int bond_xmit_hash_policy_l2(struct sk_buff *skb, 
{

	struct ethhdr *data = (struct ethhdr *)skb->data;



	return (data->h_dest[5] ^ bond_dev->dev_addr[5]) % count;

	return (data->h_dest[5] ^ data->h_source[5]) % count;

}



/*-------------------------- Device entry points ----------------------------*/

drivers/net/cnic.c

+3 −3
Original line number Diff line number Diff line
@@ -2264,9 +2264,9 @@ static void cnic_init_bnx2_rx_ring(struct cnic_dev *dev) 
	cnic_ctx_wr(dev, cid_addr, BNX2_L2CTX_CTX_TYPE, val);



	if (sb_id == 0)

		val = 2 << BNX2_L2CTX_STATUSB_NUM_SHIFT;

		val = 2 << BNX2_L2CTX_L2_STATUSB_NUM_SHIFT;

	else

		val = BNX2_L2CTX_STATUSB_NUM(sb_id);

		val = BNX2_L2CTX_L2_STATUSB_NUM(sb_id);

	cnic_ctx_wr(dev, cid_addr, BNX2_L2CTX_HOST_BDIDX, val);



	rxbd = (struct rx_bd *) (cp->l2_ring + BCM_PAGE_SIZE);
@@ -2423,7 +2423,7 @@ static int cnic_start_bnx2_hw(struct cnic_dev *dev) 
	cp->int_num = 0;

	if (ethdev->drv_state & CNIC_DRV_STATE_USING_MSIX) {

		u32 sb_id = cp->status_blk_num;

		u32 sb = BNX2_L2CTX_STATUSB_NUM(sb_id);

		u32 sb = BNX2_L2CTX_L5_STATUSB_NUM(sb_id);



		cp->int_num = sb_id << BNX2_PCICFG_INT_ACK_CMD_INT_NUM_SHIFT;

		cnic_ctx_wr(dev, cp->kwq_cid_addr, L5_KRNLQ_HOST_QIDX, sb);

CRA Git | Maintained and supported by SUSTech CRA and CCSE