Commit 4dd61d92 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: (23 commits)
  net: fix tiny output corruption of /proc/net/snmp6
  atl2: don't request irq on resume if netif running
  ipv6: use seq_release_private for ip6mr.c /proc entries
  pkt_sched: fix missing check for packet overrun in qdisc_dump_stab()
  smc911x: Fix printf format typo in smc911x driver.
  asix: Fix asix-based cards connecting to 10/100Mbs LAN.
  mv643xx_eth: fix recycle check bound
  mv643xx_eth: fix the order of mdiobus_{unregister, free}() calls
  sh: sh_eth: Update to change of mii_bus
  TPROXY: supply a struct flowi->flags argument in inet_sk_rebuild_header()
  TPROXY: fill struct flowi->flags in udp_sendmsg()
  net: ipg.c fix bracing on endian swapping
  phylib: Fix auto-negotiation restart avoidance
  net: jme.c rxdesc.flags is __le16, other missing endian swaps
  phylib: fix phy name example in documentation
  net: Do not fire linkwatch events until the device is registered.
  phonet: fix compilation with gcc-3.4
  ixgbe: fix compilation with gcc-3.4
  pktgen: fix multiple queue warning
  net: fix ip_mr_init() error path
  ...
parents 95763dd5 5ece6c2d

Documentation/networking/phy.txt

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ Letting the PHY Abstraction Layer do Everything 
   static void adjust_link(struct net_device *dev);

 

 Next, you need to know the device name of the PHY connected to this device. 

 The name will look something like, "phy0:0", where the first number is the

 The name will look something like, "0:00", where the first number is the

 bus id, and the second is the PHY's address on that bus.  Typically,

 the bus is responsible for making its ID unique.

drivers/net/atlx/atl2.c

+5 −3
Original line number Diff line number Diff line
@@ -1690,9 +1690,11 @@ static int atl2_resume(struct pci_dev *pdev) 


	ATL2_WRITE_REG(&adapter->hw, REG_WOL_CTRL, 0);



	if (netif_running(netdev)) {

		err = atl2_request_irq(adapter);

	if (netif_running(netdev) && err)

		if (err)

			return err;

	}



	atl2_reset_hw(&adapter->hw);

drivers/net/ipg.c

+4 −4
Original line number Diff line number Diff line
@@ -1112,7 +1112,7 @@ static void ipg_nic_rx_free_skb(struct net_device *dev) 
		struct ipg_rx *rxfd = sp->rxd + entry;



		pci_unmap_single(sp->pdev,

			le64_to_cpu(rxfd->frag_info & ~IPG_RFI_FRAGLEN),

			le64_to_cpu(rxfd->frag_info) & ~IPG_RFI_FRAGLEN,

			sp->rx_buf_sz, PCI_DMA_FROMDEVICE);

		dev_kfree_skb_irq(sp->rx_buff[entry]);

		sp->rx_buff[entry] = NULL;
@@ -1179,7 +1179,7 @@ static int ipg_nic_rx_check_error(struct net_device *dev) 
		 */

		if (sp->rx_buff[entry]) {

			pci_unmap_single(sp->pdev,

				le64_to_cpu(rxfd->frag_info & ~IPG_RFI_FRAGLEN),

				le64_to_cpu(rxfd->frag_info) & ~IPG_RFI_FRAGLEN,

				sp->rx_buf_sz, PCI_DMA_FROMDEVICE);



			dev_kfree_skb_irq(sp->rx_buff[entry]);
@@ -1246,7 +1246,7 @@ static void ipg_nic_rx_with_start(struct net_device *dev, 
	if (jumbo->found_start)

		dev_kfree_skb_irq(jumbo->skb);



	pci_unmap_single(pdev, le64_to_cpu(rxfd->frag_info & ~IPG_RFI_FRAGLEN),

	pci_unmap_single(pdev, le64_to_cpu(rxfd->frag_info) & ~IPG_RFI_FRAGLEN,

			 sp->rx_buf_sz, PCI_DMA_FROMDEVICE);



	skb_put(skb, sp->rxfrag_size);
@@ -1349,7 +1349,7 @@ static int ipg_nic_rx_jumbo(struct net_device *dev) 
		unsigned int entry = curr % IPG_RFDLIST_LENGTH;

		struct ipg_rx *rxfd = sp->rxd + entry;



		if (!(rxfd->rfs & le64_to_cpu(IPG_RFS_RFDDONE)))

		if (!(rxfd->rfs & cpu_to_le64(IPG_RFS_RFDDONE)))

			break;



		switch (ipg_nic_rx_check_frame_type(dev)) {

drivers/net/ixgbe/ixgbe_main.c

+28 −30
Original line number Diff line number Diff line
@@ -1287,7 +1287,34 @@ static void ixgbe_set_itr(struct ixgbe_adapter *adapter) 
	return;

}



static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter);

/**

 * ixgbe_irq_disable - Mask off interrupt generation on the NIC

 * @adapter: board private structure

 **/

static inline void ixgbe_irq_disable(struct ixgbe_adapter *adapter)

{

	IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, ~0);

	IXGBE_WRITE_FLUSH(&adapter->hw);

	if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {

		int i;

		for (i = 0; i < adapter->num_msix_vectors; i++)

			synchronize_irq(adapter->msix_entries[i].vector);

	} else {

		synchronize_irq(adapter->pdev->irq);

	}

}



/**

 * ixgbe_irq_enable - Enable default interrupt generation settings

 * @adapter: board private structure

 **/

static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter)

{

	u32 mask;

	mask = IXGBE_EIMS_ENABLE_MASK;

	IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMS, mask);

	IXGBE_WRITE_FLUSH(&adapter->hw);

}



/**

 * ixgbe_intr - legacy mode Interrupt Handler
@@ -1393,35 +1420,6 @@ static void ixgbe_free_irq(struct ixgbe_adapter *adapter) 
	}

}



/**

 * ixgbe_irq_disable - Mask off interrupt generation on the NIC

 * @adapter: board private structure

 **/

static inline void ixgbe_irq_disable(struct ixgbe_adapter *adapter)

{

	IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, ~0);

	IXGBE_WRITE_FLUSH(&adapter->hw);

	if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {

		int i;

		for (i = 0; i < adapter->num_msix_vectors; i++)

			synchronize_irq(adapter->msix_entries[i].vector);

	} else {

		synchronize_irq(adapter->pdev->irq);

	}

}



/**

 * ixgbe_irq_enable - Enable default interrupt generation settings

 * @adapter: board private structure

 **/

static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter)

{

	u32 mask;

	mask = IXGBE_EIMS_ENABLE_MASK;

	IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMS, mask);

	IXGBE_WRITE_FLUSH(&adapter->hw);

}



/**

 * ixgbe_configure_msi_and_legacy - Initialize PIN (INTA...) and MSI interrupts

 *

drivers/net/jme.c

+10 −11
Original line number Diff line number Diff line
@@ -912,23 +912,23 @@ jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx) 
		skb_put(skb, framesize);

		skb->protocol = eth_type_trans(skb, jme->dev);



		if (jme_rxsum_ok(jme, rxdesc->descwb.flags))

		if (jme_rxsum_ok(jme, le16_to_cpu(rxdesc->descwb.flags)))

			skb->ip_summed = CHECKSUM_UNNECESSARY;

		else

			skb->ip_summed = CHECKSUM_NONE;



		if (rxdesc->descwb.flags & RXWBFLAG_TAGON) {

		if (rxdesc->descwb.flags & cpu_to_le16(RXWBFLAG_TAGON)) {

			if (jme->vlgrp) {

				jme->jme_vlan_rx(skb, jme->vlgrp,

					le32_to_cpu(rxdesc->descwb.vlan));

					le16_to_cpu(rxdesc->descwb.vlan));

				NET_STAT(jme).rx_bytes += 4;

			}

		} else {

			jme->jme_rx(skb);

		}



		if ((le16_to_cpu(rxdesc->descwb.flags) & RXWBFLAG_DEST) ==

				RXWBFLAG_DEST_MUL)

		if ((rxdesc->descwb.flags & cpu_to_le16(RXWBFLAG_DEST)) ==

		    cpu_to_le16(RXWBFLAG_DEST_MUL))

			++(NET_STAT(jme).multicast);



		jme->dev->last_rx = jiffies;
@@ -961,7 +961,7 @@ jme_process_receive(struct jme_adapter *jme, int limit) 
		rxdesc = rxring->desc;

		rxdesc += i;



		if ((rxdesc->descwb.flags & RXWBFLAG_OWN) ||

		if ((rxdesc->descwb.flags & cpu_to_le16(RXWBFLAG_OWN)) ||

		!(rxdesc->descwb.desccnt & RXWBDCNT_WBCPL))

			goto out;
@@ -1763,10 +1763,9 @@ jme_expand_header(struct jme_adapter *jme, struct sk_buff *skb) 
}



static int

jme_tx_tso(struct sk_buff *skb,

		u16 *mss, u8 *flags)

jme_tx_tso(struct sk_buff *skb, __le16 *mss, u8 *flags)

{

	*mss = skb_shinfo(skb)->gso_size << TXDESC_MSS_SHIFT;

	*mss = cpu_to_le16(skb_shinfo(skb)->gso_size << TXDESC_MSS_SHIFT);

	if (*mss) {

		*flags |= TXFLAG_LSEN;
@@ -1826,11 +1825,11 @@ jme_tx_csum(struct jme_adapter *jme, struct sk_buff *skb, u8 *flags) 
}



static inline void

jme_tx_vlan(struct sk_buff *skb, u16 *vlan, u8 *flags)

jme_tx_vlan(struct sk_buff *skb, __le16 *vlan, u8 *flags)

{

	if (vlan_tx_tag_present(skb)) {

		*flags |= TXFLAG_TAGON;

		*vlan = vlan_tx_tag_get(skb);

		*vlan = cpu_to_le16(vlan_tx_tag_get(skb));

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE