Commit 4c3021da 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: (37 commits)
  net: deinit automatic LIST_HEAD
  net: dont leave active on stack LIST_HEAD
  net: provide default_advmss() methods to blackhole dst_ops
  tg3: Restrict phy ioctl access
  drivers/net: Call netif_carrier_off at the end of the probe
  ixgbe: work around for DDP last buffer size
  ixgbe: fix panic due to uninitialised pointer
  e1000e: flush all writebacks before unload
  e1000e: check down flag in tasks
  isdn: hisax: Use l2headersize() instead of dup (and buggy) func.
  arp_notify: unconditionally send gratuitous ARP for NETDEV_NOTIFY_PEERS.
  cxgb4vf: Use defined Mailbox Timeout
  cxgb4vf: Quiesce Virtual Interfaces on shutdown ...
  cxgb4vf: Behave properly when CONFIG_DEBUG_FS isn't defined ...
  cxgb4vf: Check driver parameters in the right place ...
  pch_gbe: Fix the MAC Address load issue.
  iwlwifi: Delete iwl3945_good_plcp_health.
  net/can/softing: make CAN_SOFTING_CS depend on CAN_SOFTING
  netfilter: nf_iterate: fix incorrect RCU usage
  pch_gbe: Fix the issue that the receiving data is not normal.
  ...
parents a5bbef0b ceaaec98

Documentation/networking/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -4,6 +4,8 @@ obj- := dummy.o 
# List of programs to build

# List of programs to build

hostprogs-y := ifenslave

hostprogs-y := ifenslave





HOSTCFLAGS_ifenslave.o += -I$(objtree)/usr/include



# Tell kbuild to always build the programs

# Tell kbuild to always build the programs

always := $(hostprogs-y)

always := $(hostprogs-y)

drivers/atm/solos-pci.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -866,7 +866,8 @@ static int popen(struct atm_vcc *vcc) 
	}

	}





	skb = alloc_skb(sizeof(*header), GFP_ATOMIC);

	skb = alloc_skb(sizeof(*header), GFP_ATOMIC);

	if (!skb && net_ratelimit()) {

	if (!skb) {

		if (net_ratelimit())

			dev_warn(&card->dev->dev, "Failed to allocate sk_buff in popen()\n");

			dev_warn(&card->dev->dev, "Failed to allocate sk_buff in popen()\n");

		return -ENOMEM;

		return -ENOMEM;

	}

	}

drivers/bluetooth/ath3k.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -39,6 +39,8 @@ static struct usb_device_id ath3k_table[] = { 
	/* Atheros AR3011 with sflash firmware*/

	/* Atheros AR3011 with sflash firmware*/

	{ USB_DEVICE(0x0CF3, 0x3002) },

	{ USB_DEVICE(0x0CF3, 0x3002) },





	/* Atheros AR9285 Malbec with sflash firmware */

	{ USB_DEVICE(0x03F0, 0x311D) },

	{ }	/* Terminating entry */

	{ }	/* Terminating entry */

};

};

drivers/bluetooth/btusb.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -102,6 +102,9 @@ static struct usb_device_id blacklist_table[] = { 
	/* Atheros 3011 with sflash firmware */

	/* Atheros 3011 with sflash firmware */

	{ USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE },

	{ USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE },





	/* Atheros AR9285 Malbec with sflash firmware */

	{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },



	/* Broadcom BCM2035 */

	/* Broadcom BCM2035 */

	{ USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU },

	{ USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU },

	{ USB_DEVICE(0x0a5c, 0x200a), .driver_info = BTUSB_WRONG_SCO_MTU },

	{ USB_DEVICE(0x0a5c, 0x200a), .driver_info = BTUSB_WRONG_SCO_MTU },

drivers/isdn/hisax/isdnl2.c

+13 −15
Original line number Original line Diff line number Diff line
@@ -1247,10 +1247,10 @@ static void 
l2_pull_iqueue(struct FsmInst *fi, int event, void *arg)

l2_pull_iqueue(struct FsmInst *fi, int event, void *arg)

{

{

	struct PStack *st = fi->userdata;

	struct PStack *st = fi->userdata;

	struct sk_buff *skb, *oskb;

	struct sk_buff *skb;

	struct Layer2 *l2 = &st->l2;

	struct Layer2 *l2 = &st->l2;

	u_char header[MAX_HEADER_LEN];

	u_char header[MAX_HEADER_LEN];

	int i;

	int i, hdr_space_needed;

	int unsigned p1;

	int unsigned p1;

	u_long flags;

	u_long flags;
@@ -1261,6 +1261,16 @@ l2_pull_iqueue(struct FsmInst *fi, int event, void *arg) 
	if (!skb)

	if (!skb)

		return;

		return;





	hdr_space_needed = l2headersize(l2, 0);

	if (hdr_space_needed > skb_headroom(skb)) {

		struct sk_buff *orig_skb = skb;



		skb = skb_realloc_headroom(skb, hdr_space_needed);

		if (!skb) {

			dev_kfree_skb(orig_skb);

			return;

		}

	}

	spin_lock_irqsave(&l2->lock, flags);

	spin_lock_irqsave(&l2->lock, flags);

	if(test_bit(FLG_MOD128, &l2->flag))

	if(test_bit(FLG_MOD128, &l2->flag))

		p1 = (l2->vs - l2->va) % 128;

		p1 = (l2->vs - l2->va) % 128;
@@ -1285,19 +1295,7 @@ l2_pull_iqueue(struct FsmInst *fi, int event, void *arg) 
		l2->vs = (l2->vs + 1) % 8;

		l2->vs = (l2->vs + 1) % 8;

	}

	}

	spin_unlock_irqrestore(&l2->lock, flags);

	spin_unlock_irqrestore(&l2->lock, flags);

	p1 = skb->data - skb->head;

	if (p1 >= i)

	memcpy(skb_push(skb, i), header, i);

	memcpy(skb_push(skb, i), header, i);

	else {

		printk(KERN_WARNING

		"isdl2 pull_iqueue skb header(%d/%d) too short\n", i, p1);

		oskb = skb;

		skb = alloc_skb(oskb->len + i, GFP_ATOMIC);

		memcpy(skb_put(skb, i), header, i);

		skb_copy_from_linear_data(oskb,

					  skb_put(skb, oskb->len), oskb->len);

		dev_kfree_skb(oskb);

	}

	st->l2.l2l1(st, PH_PULL | INDICATION, skb);

	st->l2.l2l1(st, PH_PULL | INDICATION, skb);

	test_and_clear_bit(FLG_ACK_PEND, &st->l2.flag);

	test_and_clear_bit(FLG_ACK_PEND, &st->l2.flag);

	if (!test_and_set_bit(FLG_T200_RUN, &st->l2.flag)) {

	if (!test_and_set_bit(FLG_T200_RUN, &st->l2.flag)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE