Commit 5d5dde2e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (25 commits)
  [XFRM]: Fix oops in xfrm4_dst_destroy()
  [XFRM_TUNNEL]: Reload header pointer after pskb_may_pull/pskb_expand_head
  [IPV4]: Use random32() in net/ipv4/multipath
  [BRIDGE]: eliminate workqueue for carrier check
  [BRIDGE]: get rid of miscdevice include
  [IPV6]: Fix __ipv6_addr_type() export in correct place.
  [IPV4] devinet: Register inetdev earlier.
  [IPV6] ADDRCONF: Register inet6_dev earlier.
  [IPV6] ADDRCONF: Manage prefix route corresponding to address manually added.
  [IPV6] IP6TUNNEL: Use update_pmtu() of dst on xmit.
  [IPV6] ADDRCONF: Statically link __ipv6_addr_type() for sunrpc subsystem.
  [IPV4]: Correct links in net/ipv4/Kconfig
  [SCTP]: Strike the transport before updating rto.
  [SCTP]: Fix connection hang/slowdown with PR-SCTP
  [TCP]: Fix MD5 signature pool locking.
  [TG3]: TSO workaround fixes.
  [AF_PACKET]: Remove unnecessary casts.
  [IPV6]: Adjust inet6_exit() cleanup sequence against inet6_init()
  [IPSEC]: More fix is needed for __xfrm6_bundle_create().
  [IRDA] net/irda/: proper prototypes
  ...
parents dafdcfba aef8811a

drivers/bluetooth/bcm203x.c

+2 −0
Original line number Diff line number Diff line
@@ -307,3 +307,5 @@ MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); 
MODULE_DESCRIPTION("Broadcom Blutonium firmware driver ver " VERSION);

MODULE_VERSION(VERSION);

MODULE_LICENSE("GPL");

MODULE_FIRMWARE("BCM2033-MD.hex");

MODULE_FIRMWARE("BCM2033-FW.bin");

drivers/bluetooth/bfusb.c

+1 −0
Original line number Diff line number Diff line
@@ -801,3 +801,4 @@ MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); 
MODULE_DESCRIPTION("BlueFRITZ! USB driver ver " VERSION);

MODULE_VERSION(VERSION);

MODULE_LICENSE("GPL");

MODULE_FIRMWARE("bfubase.frm");

drivers/bluetooth/bt3c_cs.c

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>, Jose Orlando Pereira <jop@di.uminho.pt>");

MODULE_DESCRIPTION("Bluetooth driver for the 3Com Bluetooth PCMCIA card");

MODULE_LICENSE("GPL");

MODULE_FIRMWARE("BT3CPCC.bin");

drivers/net/tg3.c

+11 −9
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ 


#define DRV_MODULE_NAME		"tg3"

#define PFX DRV_MODULE_NAME	": "

#define DRV_MODULE_VERSION	"3.73"

#define DRV_MODULE_RELDATE	"February 12, 2007"

#define DRV_MODULE_VERSION	"3.74"

#define DRV_MODULE_RELDATE	"February 20, 2007"



#define TG3_DEF_MAC_MODE	0

#define TG3_DEF_RX_MODE		0
@@ -3993,7 +3993,10 @@ static int tg3_tso_bug(struct tg3 *tp, struct sk_buff *skb) 
	/* Estimate the number of fragments in the worst case */

	if (unlikely(tg3_tx_avail(tp) <= (skb_shinfo(skb)->gso_segs * 3))) {

		netif_stop_queue(tp->dev);

		if (tg3_tx_avail(tp) <= (skb_shinfo(skb)->gso_segs * 3))

			return NETDEV_TX_BUSY;



		netif_wake_queue(tp->dev);

	}



	segs = skb_gso_segment(skb, tp->dev->features & ~NETIF_F_TSO);
@@ -4061,7 +4064,7 @@ static int tg3_start_xmit_dma_bug(struct sk_buff *skb, struct net_device *dev) 


		hdr_len = ip_tcp_len + tcp_opt_len;

		if (unlikely((ETH_HLEN + hdr_len) > 80) &&

			     (tp->tg3_flags2 & TG3_FLG2_HW_TSO_1_BUG))

			     (tp->tg3_flags2 & TG3_FLG2_TSO_BUG))

			return (tg3_tso_bug(tp, skb));



		base_flags |= (TXD_FLAG_CPU_PRE_DMA |
@@ -8137,7 +8140,7 @@ static int tg3_set_ringparam(struct net_device *dev, struct ethtool_ringparam *e 
	    (ering->rx_jumbo_pending > TG3_RX_JUMBO_RING_SIZE - 1) ||

	    (ering->tx_pending > TG3_TX_RING_SIZE - 1) ||

	    (ering->tx_pending <= MAX_SKB_FRAGS) ||

	    ((tp->tg3_flags2 & TG3_FLG2_HW_TSO_1_BUG) &&

	    ((tp->tg3_flags2 & TG3_FLG2_TSO_BUG) &&

	     (ering->tx_pending <= (MAX_SKB_FRAGS * 3))))

		return -EINVAL;
@@ -10557,12 +10560,11 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) 
			tp->tg3_flags2 |= TG3_FLG2_HW_TSO_2;

			tp->tg3_flags2 |= TG3_FLG2_1SHOT_MSI;

		} else {

			tp->tg3_flags2 |= TG3_FLG2_HW_TSO_1 |

					  TG3_FLG2_HW_TSO_1_BUG;

			tp->tg3_flags2 |= TG3_FLG2_HW_TSO_1 | TG3_FLG2_TSO_BUG;

			if (GET_ASIC_REV(tp->pci_chip_rev_id) ==

				ASIC_REV_5750 &&

	     		    tp->pci_chip_rev_id >= CHIPREV_ID_5750_C2)

				tp->tg3_flags2 &= ~TG3_FLG2_HW_TSO_1_BUG;

				tp->tg3_flags2 &= ~TG3_FLG2_TSO_BUG;

		}

	}
@@ -11867,7 +11869,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, 
	    (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) != 0) {

		tp->tg3_flags2 &= ~TG3_FLG2_TSO_CAPABLE;

	} else {

		tp->tg3_flags2 |= TG3_FLG2_TSO_CAPABLE;

		tp->tg3_flags2 |= TG3_FLG2_TSO_CAPABLE | TG3_FLG2_TSO_BUG;

	}



	/* TSO is on by default on chips that support hardware TSO.

drivers/net/tg3.h

+1 −1
Original line number Diff line number Diff line
@@ -2227,7 +2227,7 @@ struct tg3 { 
#define TG3_FLAG_INIT_COMPLETE		0x80000000

	u32				tg3_flags2;

#define TG3_FLG2_RESTART_TIMER		0x00000001

#define TG3_FLG2_HW_TSO_1_BUG		0x00000002

#define TG3_FLG2_TSO_BUG		0x00000002

#define TG3_FLG2_NO_ETH_WIRE_SPEED	0x00000004

#define TG3_FLG2_IS_5788		0x00000008

#define TG3_FLG2_MAX_RXPEND_64		0x00000010

CRA Git | Maintained and supported by SUSTech CRA and CCSE