Commit 09075ef0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* HEAD:
  [AX.25]: Use kzalloc
  [ATM] net/atm/clip.c: fix PROC_FS=n compile
  [PKT_SCHED]: act_api: Fix module leak while flushing actions
  [NET]: Fix IPv4/DECnet routing rule dumping
  [NET] gso: Fix up GSO packets with broken checksums
  [NET] gso: Add skb_is_gso
  [IRDA]: fix drivers/net/irda/ali-ircc.c:ali_ircc_init()
  [ATM]: fix possible recursive locking in skb_migrate()
  [ATM]: Typo in drivers/atm/Kconfig...
  [TG3]: add amd8131 to "write reorder" chipsets
  [NET]: Fix network device interface printk message priority
parents c87fed15 1b30dd35

drivers/atm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ config ATM_FORE200E_USE_TASKLET 
	default n

	help

	  This defers work to be done by the interrupt handler to a

	  tasklet instead of hanlding everything at interrupt time.  This

	  tasklet instead of handling everything at interrupt time.  This

	  may improve the responsive of the host.



config ATM_FORE200E_TX_RETRY

drivers/net/bnx2.c

+1 −1
Original line number Diff line number Diff line
@@ -1639,7 +1639,7 @@ bnx2_tx_int(struct bnx2 *bp) 
		skb = tx_buf->skb;

#ifdef BCM_TSO 

		/* partial BD completions possible with TSO packets */

		if (skb_shinfo(skb)->gso_size) {

		if (skb_is_gso(skb)) {

			u16 last_idx, last_ring_idx;



			last_idx = sw_cons +

drivers/net/chelsio/sge.c

+1 −1
Original line number Diff line number Diff line
@@ -1417,7 +1417,7 @@ int t1_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	struct cpl_tx_pkt *cpl;



#ifdef NETIF_F_TSO

	if (skb_shinfo(skb)->gso_size) {

	if (skb_is_gso(skb)) {

		int eth_type;

		struct cpl_tx_pkt_lso *hdr;

drivers/net/e1000/e1000_main.c

+3 −4
Original line number Diff line number Diff line
@@ -2524,7 +2524,7 @@ e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring, 
	uint8_t ipcss, ipcso, tucss, tucso, hdr_len;

	int err;



	if (skb_shinfo(skb)->gso_size) {

	if (skb_is_gso(skb)) {

		if (skb_header_cloned(skb)) {

			err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);

			if (err)
@@ -2649,7 +2649,7 @@ e1000_tx_map(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring, 
		 * tso gets written back prematurely before the data is fully

		 * DMA'd to the controller */

		if (!skb->data_len && tx_ring->last_tx_tso &&

		    !skb_shinfo(skb)->gso_size) {

		    !skb_is_gso(skb)) {

			tx_ring->last_tx_tso = 0;

			size -= 4;

		}
@@ -2937,8 +2937,7 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev) 


#ifdef NETIF_F_TSO

	/* Controller Erratum workaround */

	if (!skb->data_len && tx_ring->last_tx_tso &&

	    !skb_shinfo(skb)->gso_size)

	if (!skb->data_len && tx_ring->last_tx_tso && !skb_is_gso(skb))

		count++;

#endif

drivers/net/forcedeth.c

+1 −1
Original line number Diff line number Diff line
@@ -1495,7 +1495,7 @@ static int nv_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	np->tx_skbuff[nr] = skb;



#ifdef NETIF_F_TSO

	if (skb_shinfo(skb)->gso_size)

	if (skb_is_gso(skb))

		tx_flags_extra = NV_TX2_TSO | (skb_shinfo(skb)->gso_size << NV_TX2_TSO_SHIFT);

	else

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE