linux-next: manual merge of the net tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/ethernet/broadcom/tg3.c between commit 5c1e688388f6 ("tg3:
fix VLAN tagging regression") from Linus' tree and commit 93a700a9d20b
("tg3: Code movement") from the net tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/net/ethernet/broadcom/tg3.c
index 4a1374d,1485013..0000000
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@@ -6234,15 -6734,17 +6734,15 @@@ static netdev_tx_t tg3_start_xmit(struc
  		}
  	}
  
+ 	if (tg3_flag(tp, USE_JUMBO_BDFLAG) &&
+ 	    !mss && skb->len > VLAN_ETH_FRAME_LEN)
+ 		base_flags |= TXD_FLAG_JMB_PKT;
+ 
 -#ifdef BCM_KERNEL_SUPPORTS_8021Q
  	if (vlan_tx_tag_present(skb)) {
  		base_flags |= TXD_FLAG_VLAN;
  		vlan = vlan_tx_tag_get(skb);
  	}
 -#endif
  
- 	if (tg3_flag(tp, USE_JUMBO_BDFLAG) &&
- 	    !mss && skb->len > VLAN_ETH_FRAME_LEN)
- 		base_flags |= TXD_FLAG_JMB_PKT;
- 
  	len = skb_headlen(skb);
  
  	mapping = pci_map_single(tp->pdev, skb->data, len, PCI_DMA_TODEVICE);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/