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

Commit e3c0ac04 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 

* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  PHY: Add the phy_device_release device method.
  gianfar: fix compile warning
  pasemi_mac: Fix reuse of free'd skb
  SMC911X: Fix using of dereferenced skb after netif_rx
  sky2: recovery deadlock fix
  Fix memory corruption in fec_mpc52xx
  Don't claim to do IPv6 checksum offload
  cxgb - revert file mode changes.
parents 943547ab 6f4a7f41

drivers/net/chelsio/cxgb2.c

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

drivers/net/chelsio/pm3393.c

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

drivers/net/chelsio/sge.c

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

drivers/net/chelsio/sge.h

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

drivers/net/fec_mpc52xx.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -422,7 +422,7 @@ static irqreturn_t mpc52xx_fec_rx_interrupt(int irq, void *dev_id) 




		rskb = bcom_retrieve_buffer(priv->rx_dmatsk, &status,

		rskb = bcom_retrieve_buffer(priv->rx_dmatsk, &status,

				(struct bcom_bd **)&bd);

				(struct bcom_bd **)&bd);

		dma_unmap_single(&dev->dev, bd->skb_pa, skb->len, DMA_FROM_DEVICE);

		dma_unmap_single(&dev->dev, bd->skb_pa, rskb->len, DMA_FROM_DEVICE);





		/* Test for errors in received frame */

		/* Test for errors in received frame */

		if (status & BCOM_FEC_RX_BD_ERRORS) {

		if (status & BCOM_FEC_RX_BD_ERRORS) {
@@ -467,7 +467,7 @@ static irqreturn_t mpc52xx_fec_rx_interrupt(int irq, void *dev_id) 
			bcom_prepare_next_buffer(priv->rx_dmatsk);

			bcom_prepare_next_buffer(priv->rx_dmatsk);





		bd->status = FEC_RX_BUFFER_SIZE;

		bd->status = FEC_RX_BUFFER_SIZE;

		bd->skb_pa = dma_map_single(&dev->dev, rskb->data,

		bd->skb_pa = dma_map_single(&dev->dev, skb->data,

				FEC_RX_BUFFER_SIZE, DMA_FROM_DEVICE);

				FEC_RX_BUFFER_SIZE, DMA_FROM_DEVICE);





		bcom_submit_next_buffer(priv->rx_dmatsk, skb);

		bcom_submit_next_buffer(priv->rx_dmatsk, skb);