Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3806c3b 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:
  bnx2: Fix bug in bnx2_free_rx_mem().
  irda: Add irda_skb_cb qdisc related padding
  jme: Fixed a typo
  net: kernel BUG at drivers/net/phy/mdio_bus.c:165!
  drivers/net: starfire: Fix napi ->poll() weight handling
  tlan: Fix pci memory unmapping
  enc28j60: use netif_rx_ni() to deliver RX packets
  tlan: Fix small (< 64 bytes) datagram transmissions
  netfilter: ctnetlink: fix missing CTA_NAT_SEQ_UNSPEC
parents 3653b9a8 3298a738

drivers/net/bnx2.c

+3 −3
Original line number Diff line number Diff line
@@ -543,9 +543,9 @@ bnx2_free_rx_mem(struct bnx2 *bp) 
		for (j = 0; j < bp->rx_max_pg_ring; j++) {

			if (rxr->rx_pg_desc_ring[j])

				pci_free_consistent(bp->pdev, RXBD_RING_SIZE,

						    rxr->rx_pg_desc_ring[i],

						    rxr->rx_pg_desc_mapping[i]);

			rxr->rx_pg_desc_ring[i] = NULL;

						    rxr->rx_pg_desc_ring[j],

						    rxr->rx_pg_desc_mapping[j]);

			rxr->rx_pg_desc_ring[j] = NULL;

		}

		if (rxr->rx_pg_ring)

			vfree(rxr->rx_pg_ring);

drivers/net/enc28j60.c

+1 −1
Original line number Diff line number Diff line
@@ -959,7 +959,7 @@ static void enc28j60_hw_rx(struct net_device *ndev) 
			ndev->stats.rx_packets++;

			ndev->stats.rx_bytes += len;

			ndev->last_rx = jiffies;

			netif_rx(skb);

			netif_rx_ni(skb);

		}

	}

	/*

drivers/net/jme.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
 */



#ifndef __JME_H_INCLUDED__

#define __JME_H_INCLUDEE__

#define __JME_H_INCLUDED__



#define DRV_NAME	"jme"

#define DRV_VERSION	"1.0.3"

drivers/net/phy/mdio_bus.c

+3 −2
Original line number Diff line number Diff line
@@ -105,8 +105,6 @@ int mdiobus_register(struct mii_bus *bus) 
		return -EINVAL;

	}



	bus->state = MDIOBUS_REGISTERED;



	mutex_init(&bus->mdio_lock);



	if (bus->reset)
@@ -123,6 +121,9 @@ int mdiobus_register(struct mii_bus *bus) 
		}

	}



	if (!err)

		bus->state = MDIOBUS_REGISTERED;



	pr_info("%s: probed\n", bus->name);



	return err;

drivers/net/starfire.c

+5 −0
Original line number Diff line number Diff line
@@ -1509,6 +1509,11 @@ static int __netdev_rx(struct net_device *dev, int *quota) 
		desc->status = 0;

		np->rx_done = (np->rx_done + 1) % DONE_Q_SIZE;

	}



	if (*quota == 0) {	/* out of rx quota */

		retcode = 1;

		goto out;

	}

	writew(np->rx_done, np->base + CompletionQConsumerIdx);



 out: