Commit 002e473d 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: (28 commits)
  ipheth: remove incorrect devtype to WWAN
  MAINTAINERS: Add CAIF
  sctp: fix test for end of loop
  KS8851: Correct RX packet allocation
  udp: add rehash on connect()
  net: blackhole route should always be recalculated
  ipv4: Suppress lockdep-RCU false positive in FIB trie (3)
  niu: Fix kernel buffer overflow for ETHTOOL_GRXCLSRLALL
  ipvs: fix active FTP
  gro: Re-fix different skb headrooms
  via-velocity: Turn scatter-gather support back off.
  ipv4: Fix reverse path filtering with multipath routing.
  UNIX: Do not loop forever at unix_autobind().
  PATCH: b44 Handle RX FIFO overflow better (simplified)
  irda: off by one
  3c59x: Fix deadlock in vortex_error()
  netfilter: discard overlapping IPv6 fragment
  ipv6: discard overlapping fragment
  net: fix tx queue selection for bridged devices implementing select_queue
  bonding: Fix jiffies overflow problems (again)
  ...

Fix up trivial conflicts due to the same cgroup API thinko fix going
through both Andrew and the networking tree.  However, there were small
differences between the two, with Andrew's version generally being the
nicer one, and the one I merged first. So pick that one.

Conflicts in: include/linux/cgroup.h and kernel/cgroup.c
parents 10d90f28 053d8f66

MAINTAINERS

+10 −0
Original line number Diff line number Diff line
@@ -1445,6 +1445,16 @@ S: Maintained 
F:	Documentation/video4linux/cafe_ccic

F:	drivers/media/video/cafe_ccic*



CAIF NETWORK LAYER

M:	Sjur Braendeland <sjur.brandeland@stericsson.com>

L:	netdev@vger.kernel.org

S:	Supported

F:	Documentation/networking/caif/

F:	drivers/net/caif/

F:	include/linux/caif/

F:	include/net/caif/

F:	net/caif/



CALGARY x86-64 IOMMU

M:	Muli Ben-Yehuda <muli@il.ibm.com>

M:	"Jon D. Mason" <jdmason@kudzu.us>

drivers/net/3c59x.c

+7 −3
Original line number Diff line number Diff line
@@ -1994,10 +1994,9 @@ vortex_error(struct net_device *dev, int status) 
		}

	}



	if (status & RxEarly) {				/* Rx early is unused. */

		vortex_rx(dev);

	if (status & RxEarly)				/* Rx early is unused. */

		iowrite16(AckIntr | RxEarly, ioaddr + EL3_CMD);

	}



	if (status & StatsFull) {			/* Empty statistics. */

		static int DoneDidThat;

		if (vortex_debug > 4)
@@ -2298,7 +2297,12 @@ vortex_interrupt(int irq, void *dev_id) 
		if (status & (HostError | RxEarly | StatsFull | TxComplete | IntReq)) {

			if (status == 0xffff)

				break;

			if (status & RxEarly)

				vortex_rx(dev);

			spin_unlock(&vp->window_lock);

			vortex_error(dev, status);

			spin_lock(&vp->window_lock);

			window_set(vp, 7);

		}



		if (--work_done < 0) {

drivers/net/b44.c

+9 −0
Original line number Diff line number Diff line
@@ -848,6 +848,15 @@ static int b44_poll(struct napi_struct *napi, int budget) 
		b44_tx(bp);

		/* spin_unlock(&bp->tx_lock); */

	}

	if (bp->istat & ISTAT_RFO) {	/* fast recovery, in ~20msec */

		bp->istat &= ~ISTAT_RFO;

		b44_disable_ints(bp);

		ssb_device_enable(bp->sdev, 0); /* resets ISTAT_RFO */

		b44_init_rings(bp);

		b44_init_hw(bp, B44_FULL_RESET_SKIP_PHY);

		netif_wake_queue(bp->dev);

	}



	spin_unlock_irqrestore(&bp->lock, flags);



	work_done = 0;

drivers/net/benet/be.h

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ struct be_drvr_stats { 
	u64 be_rx_bytes_prev;

	u64 be_rx_pkts;

	u32 be_rx_rate;

	u32 be_rx_mcast_pkt;

	/* number of non ether type II frames dropped where

	 * frame len > length field of Mac Hdr */

	u32 be_802_3_dropped_frames;

drivers/net/benet/be_cmds.c

+3 −5
Original line number Diff line number Diff line
@@ -140,9 +140,7 @@ int be_process_mcc(struct be_adapter *adapter, int *status) 
	while ((compl = be_mcc_compl_get(adapter))) {

		if (compl->flags & CQE_FLAGS_ASYNC_MASK) {

			/* Interpret flags as an async trailer */

			BUG_ON(!is_link_state_evt(compl->flags));



			/* Interpret compl as a async link evt */

			if (is_link_state_evt(compl->flags))

				be_async_link_state_process(adapter,

				(struct be_async_event_link_state *) compl);

		} else if (compl->flags & CQE_FLAGS_COMPLETED_MASK) {
@@ -207,7 +205,7 @@ static int be_mbox_db_ready_wait(struct be_adapter *adapter, void __iomem *db) 


		if (msecs > 4000) {

			dev_err(&adapter->pdev->dev, "mbox poll timed out\n");

			be_dump_ue(adapter);

			be_detect_dump_ue(adapter);

			return -1;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE