Commit 85746e42 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: (31 commits)
  sctp: fix missing send up SCTP_SENDER_DRY_EVENT when subscribe it
  net: refine {udp|tcp|sctp}_mem limits
  vmxnet3: round down # of queues to power of two
  net: sh_eth: fix the parameter for the ETHER of SH7757
  net: sh_eth: fix cannot work half-duplex mode
  net: vlan: enable soft features regardless of underlying device
  vmxnet3: fix starving rx ring whenoc_skb kb fails
  bridge: Always flood broadcast packets
  greth: greth_set_mac_add would corrupt the MAC address.
  net: bind() fix error return on wrong address family
  natsemi: silence dma-debug warnings
  net: 8139too: Initial necessary vlan_features to support vlan
  Fix call trace when interrupts are disabled while sleeping function kzalloc is called
  qlge:Version change to v1.00.00.29
  qlge: Fix printk priority so chip fatal errors are always reported.
  qlge:Fix crash caused by mailbox execution on wedged chip.
  xfrm4: Don't call icmp_send on local error
  ipv4: Don't use ufo handling on later transformed packets
  xfrm: Remove family arg from xfrm_bundle_ok
  ipv6: Don't put artificial limit on routing table size.
  ...
parents 4dd1b49c 94912301

drivers/net/8139too.c

+1 −0
Original line number Diff line number Diff line
@@ -992,6 +992,7 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev, 
	 * features

	 */

	dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_HIGHDMA;

	dev->vlan_features = dev->features;



	dev->irq = pdev->irq;

drivers/net/bna/bnad.c

+3 −4
Original line number Diff line number Diff line
@@ -1111,7 +1111,7 @@ bnad_mbox_irq_alloc(struct bnad *bnad, 
		    struct bna_intr_info *intr_info)

{

	int 		err = 0;

	unsigned long 	flags;

	unsigned long 	irq_flags = 0, flags;

	u32	irq;

	irq_handler_t 	irq_handler;
@@ -1125,18 +1125,17 @@ bnad_mbox_irq_alloc(struct bnad *bnad, 
	if (bnad->cfg_flags & BNAD_CF_MSIX) {

		irq_handler = (irq_handler_t)bnad_msix_mbox_handler;

		irq = bnad->msix_table[bnad->msix_num - 1].vector;

		flags = 0;

		intr_info->intr_type = BNA_INTR_T_MSIX;

		intr_info->idl[0].vector = bnad->msix_num - 1;

	} else {

		irq_handler = (irq_handler_t)bnad_isr;

		irq = bnad->pcidev->irq;

		flags = IRQF_SHARED;

		irq_flags = IRQF_SHARED;

		intr_info->intr_type = BNA_INTR_T_INTX;

		/* intr_info->idl.vector = 0 ? */

	}

	spin_unlock_irqrestore(&bnad->bna_lock, flags);



	flags = irq_flags;

	sprintf(bnad->mbox_irq_name, "%s", BNAD_NAME);



	/*

drivers/net/greth.c

+3 −4
Original line number Diff line number Diff line
@@ -1015,11 +1015,10 @@ static int greth_set_mac_add(struct net_device *dev, void *p) 
		return -EINVAL;



	memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);

	GRETH_REGSAVE(regs->esa_msb, dev->dev_addr[0] << 8 | dev->dev_addr[1]);

	GRETH_REGSAVE(regs->esa_lsb, dev->dev_addr[2] << 24 | dev->dev_addr[3] << 16 |

		      dev->dev_addr[4] << 8 | dev->dev_addr[5]);



	GRETH_REGSAVE(regs->esa_msb, addr->sa_data[0] << 8 | addr->sa_data[1]);

	GRETH_REGSAVE(regs->esa_lsb,

		      addr->sa_data[2] << 24 | addr->

		      sa_data[3] << 16 | addr->sa_data[4] << 8 | addr->sa_data[5]);

	return 0;

}

drivers/net/hamradio/6pack.c

+2 −2
Original line number Diff line number Diff line
@@ -692,10 +692,10 @@ static void sixpack_close(struct tty_struct *tty) 
{

	struct sixpack *sp;



	write_lock(&disc_data_lock);

	write_lock_bh(&disc_data_lock);

	sp = tty->disc_data;

	tty->disc_data = NULL;

	write_unlock(&disc_data_lock);

	write_unlock_bh(&disc_data_lock);

	if (!sp)

		return;

drivers/net/hamradio/mkiss.c

+2 −2
Original line number Diff line number Diff line
@@ -813,10 +813,10 @@ static void mkiss_close(struct tty_struct *tty) 
{

	struct mkiss *ax;



	write_lock(&disc_data_lock);

	write_lock_bh(&disc_data_lock);

	ax = tty->disc_data;

	tty->disc_data = NULL;

	write_unlock(&disc_data_lock);

	write_unlock_bh(&disc_data_lock);



	if (!ax)

		return;

CRA Git | Maintained and supported by SUSTech CRA and CCSE