Commit ae830600 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: (47 commits)
  ehea: Fix napi list corruption on ifconfig down
  igbvf: Allow VF driver to correctly recognize failure to set mac
  3c59x: Fix build failure with gcc 3.2
  sky2: Avoid transmits during sky2_down()
  iwlagn: do not send key clear commands when rfkill enabled
  libertas: Read buffer overflow
  drivers/net/wireless: introduce missing kfree
  drivers/net/wireless/iwlwifi: introduce missing kfree
  zd1211rw: fix unaligned access in zd_mac_rx
  cfg80211: fix regression on beacon world roaming feature
  cfg80211: add two missing NULL pointer checks
  ixgbe: Patch to modify 82598 PCIe completion timeout values
  bluetooth: rfcomm_init bug fix
  mlx4_en: Fix double pci unmapping.
  mISDN: Fix handling of receive buffer size in L1oIP
  pcnet32: VLB support fixes
  pcnet32: remove superfluous NULL pointer check in pcnet32_probe1()
  net: restore the original spinlock to protect unicast list
  netxen: fix coherent dma mask setting
  mISDN: Read buffer overflow
  ...
parents 2edb3898 357eb46d

Documentation/DocBook/kernel-hacking.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -449,8 +449,8 @@ printk(KERN_INFO "i = %u\n", i); 
   </para>



   <programlisting>

__u32 ipaddress;

printk(KERN_INFO "my ip: %d.%d.%d.%d\n", NIPQUAD(ipaddress));

__be32 ipaddress;

printk(KERN_INFO "my ip: %pI4\n", &amp;ipaddress);

   </programlisting>



   <para>

drivers/isdn/mISDN/l1oip_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1480,7 +1480,7 @@ l1oip_init(void) 
		return -ENOMEM;



	l1oip_cnt = 0;

	while (type[l1oip_cnt] && l1oip_cnt < MAX_CARDS) {

	while (l1oip_cnt < MAX_CARDS && type[l1oip_cnt]) {

		switch (type[l1oip_cnt] & 0xff) {

		case 1:

			pri = 0;

drivers/net/3c515.c

+3 −1
Original line number Diff line number Diff line
@@ -832,7 +832,9 @@ static int corkscrew_open(struct net_device *dev) 
			skb_reserve(skb, 2);	/* Align IP on 16 byte boundaries */

			vp->rx_ring[i].addr = isa_virt_to_bus(skb->data);

		}

		vp->rx_ring[i - 1].next = isa_virt_to_bus(&vp->rx_ring[0]);	/* Wrap the ring. */

		if (i != 0)

			vp->rx_ring[i - 1].next =

				isa_virt_to_bus(&vp->rx_ring[0]);	/* Wrap the ring. */

		outl(isa_virt_to_bus(&vp->rx_ring[0]), ioaddr + UpListPtr);

	}

	if (vp->full_bus_master_tx) {	/* Boomerang bus master Tx. */

drivers/net/3c59x.c

+6 −4
Original line number Diff line number Diff line
@@ -2721,13 +2721,15 @@ dump_tx_ring(struct net_device *dev) 
				   &vp->tx_ring[vp->dirty_tx % TX_RING_SIZE]);

			issue_and_wait(dev, DownStall);

			for (i = 0; i < TX_RING_SIZE; i++) {

				pr_err("  %d: @%p  length %8.8x status %8.8x\n", i,

					   &vp->tx_ring[i],

				unsigned int length;



#if DO_ZEROCOPY

					   le32_to_cpu(vp->tx_ring[i].frag[0].length),

				length = le32_to_cpu(vp->tx_ring[i].frag[0].length);

#else

					   le32_to_cpu(vp->tx_ring[i].length),

				length = le32_to_cpu(vp->tx_ring[i].length);

#endif

				pr_err("  %d: @%p  length %8.8x status %8.8x\n",

					   i, &vp->tx_ring[i], length,

					   le32_to_cpu(vp->tx_ring[i].status));

			}

			if (!stalled)

drivers/net/eexpress.c

+3 −3
Original line number Diff line number Diff line
@@ -1474,13 +1474,13 @@ static void eexp_hw_init586(struct net_device *dev) 
	outw(0x0000, ioaddr + 0x800c);

	outw(0x0000, ioaddr + 0x800e);



	for (i = 0; i < (sizeof(start_code)); i+=32) {

	for (i = 0; i < ARRAY_SIZE(start_code) * 2; i+=32) {

		int j;

		outw(i, ioaddr + SM_PTR);

		for (j = 0; j < 16; j+=2)

		for (j = 0; j < 16 && (i+j)/2 < ARRAY_SIZE(start_code); j+=2)

			outw(start_code[(i+j)/2],

			     ioaddr+0x4000+j);

		for (j = 0; j < 16; j+=2)

		for (j = 0; j < 16 && (i+j+16)/2 < ARRAY_SIZE(start_code); j+=2)

			outw(start_code[(i+j+16)/2],

			     ioaddr+0x8000+j);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE