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

Commit 847e9170 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: (27 commits)
  rtnetlink: propagate error from dev_change_flags in do_setlink()
  isdn: remove extra byteswap in isdn_net_ciscohdlck_slarp_send_reply
  Phonet: refuse to send bigger than MTU packets
  e1000e: fix IPMI traffic
  e1000e: fix warn_on reload after phy_id error
  phy: fix phy address bug
  e100: fix dma error in direction for mapping
  igb: use dev_printk instead of printk
  qla3xxx: Cleanup: Fix link print statements.
  igb: Use device_set_wakeup_enable
  e1000: Use device_set_wakeup_enable
  e1000e: Use device_set_wakeup_enable
  via-velocity: enable perfect filtering for multicast packets
  phy: Add support for Marvell 88E1118 PHY
  mlx4_en: Pause parameters per port
  phylib: fix premature freeing of struct mii_bus
  atl1: Do not enumerate options unsupported by chip
  atl1e: fix broken multicast by removing unnecessary crc inversion
  gianfar: Fix DMA unmap invocations
  net/ucc_geth: Fix oops in uec_get_ethtool_stats()
  ...
parents 72eb8c67 5f9021cf

drivers/isdn/i4l/isdn_net.c

+4 −2
Original line number Diff line number Diff line
@@ -1641,8 +1641,10 @@ isdn_net_ciscohdlck_slarp_send_reply(isdn_net_local *lp) 
	/* slarp reply, send own ip/netmask; if values are nonsense remote

	 * should think we are unable to provide it with an address via SLARP */

	p += put_u32(p, CISCO_SLARP_REPLY);

	p += put_u32(p, addr);	// address

	p += put_u32(p, mask);	// netmask

	*(__be32 *)p = addr;	// address

	p += 4;

	*(__be32 *)p = mask;	// netmask

	p += 4;

	p += put_u16(p, 0);	// unused



	isdn_net_write_super(lp, skb);

drivers/net/atl1e/atl1e_hw.c

+0 −4
Original line number Diff line number Diff line
@@ -163,9 +163,6 @@ int atl1e_read_mac_addr(struct atl1e_hw *hw) 
 * atl1e_hash_mc_addr

 *  purpose

 *      set hash value for a multicast address

 *      hash calcu processing :

 *          1. calcu 32bit CRC for multicast address

 *          2. reverse crc with MSB to LSB

 */

u32 atl1e_hash_mc_addr(struct atl1e_hw *hw, u8 *mc_addr)

{
@@ -174,7 +171,6 @@ u32 atl1e_hash_mc_addr(struct atl1e_hw *hw, u8 *mc_addr) 
	int i;



	crc32 = ether_crc_le(6, mc_addr);

	crc32 = ~crc32;

	for (i = 0; i < 32; i++)

		value |= (((crc32 >> i) & 1) << (31 - i));

drivers/net/atlx/atl1.c

+3 −14
Original line number Diff line number Diff line
@@ -3404,14 +3404,8 @@ static void atl1_get_wol(struct net_device *netdev, 
{

	struct atl1_adapter *adapter = netdev_priv(netdev);



	wol->supported = WAKE_UCAST | WAKE_MCAST | WAKE_BCAST | WAKE_MAGIC;

	wol->supported = WAKE_MAGIC;

	wol->wolopts = 0;

	if (adapter->wol & ATLX_WUFC_EX)

		wol->wolopts |= WAKE_UCAST;

	if (adapter->wol & ATLX_WUFC_MC)

		wol->wolopts |= WAKE_MCAST;

	if (adapter->wol & ATLX_WUFC_BC)

		wol->wolopts |= WAKE_BCAST;

	if (adapter->wol & ATLX_WUFC_MAG)

		wol->wolopts |= WAKE_MAGIC;

	return;
@@ -3422,15 +3416,10 @@ static int atl1_set_wol(struct net_device *netdev, 
{

	struct atl1_adapter *adapter = netdev_priv(netdev);



	if (wol->wolopts & (WAKE_PHY | WAKE_ARP | WAKE_MAGICSECURE))

	if (wol->wolopts & (WAKE_PHY | WAKE_UCAST | WAKE_MCAST | WAKE_BCAST |

		WAKE_ARP | WAKE_MAGICSECURE))

		return -EOPNOTSUPP;

	adapter->wol = 0;

	if (wol->wolopts & WAKE_UCAST)

		adapter->wol |= ATLX_WUFC_EX;

	if (wol->wolopts & WAKE_MCAST)

		adapter->wol |= ATLX_WUFC_MC;

	if (wol->wolopts & WAKE_BCAST)

		adapter->wol |= ATLX_WUFC_BC;

	if (wol->wolopts & WAKE_MAGIC)

		adapter->wol |= ATLX_WUFC_MAG;

	return 0;

drivers/net/e100.c

+10 −10
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ 


#define DRV_NAME		"e100"

#define DRV_EXT			"-NAPI"

#define DRV_VERSION		"3.5.23-k4"DRV_EXT

#define DRV_VERSION		"3.5.23-k6"DRV_EXT

#define DRV_DESCRIPTION		"Intel(R) PRO/100 Network Driver"

#define DRV_COPYRIGHT		"Copyright(c) 1999-2006 Intel Corporation"

#define PFX			DRV_NAME ": "
@@ -1804,7 +1804,7 @@ static int e100_rx_alloc_skb(struct nic *nic, struct rx *rx) 
		struct rfd *prev_rfd = (struct rfd *)rx->prev->skb->data;

		put_unaligned_le32(rx->dma_addr, &prev_rfd->link);

		pci_dma_sync_single_for_device(nic->pdev, rx->prev->dma_addr,

			sizeof(struct rfd), PCI_DMA_TODEVICE);

			sizeof(struct rfd), PCI_DMA_BIDIRECTIONAL);

	}



	return 0;
@@ -1823,7 +1823,7 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx, 


	/* Need to sync before taking a peek at cb_complete bit */

	pci_dma_sync_single_for_cpu(nic->pdev, rx->dma_addr,

		sizeof(struct rfd), PCI_DMA_FROMDEVICE);

		sizeof(struct rfd), PCI_DMA_BIDIRECTIONAL);

	rfd_status = le16_to_cpu(rfd->status);



	DPRINTK(RX_STATUS, DEBUG, "status=0x%04X\n", rfd_status);
@@ -1850,7 +1850,7 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx, 


	/* Get data */

	pci_unmap_single(nic->pdev, rx->dma_addr,

		RFD_BUF_LEN, PCI_DMA_FROMDEVICE);

		RFD_BUF_LEN, PCI_DMA_BIDIRECTIONAL);



	/* If this buffer has the el bit, but we think the receiver

	 * is still running, check to see if it really stopped while
@@ -1943,7 +1943,7 @@ static void e100_rx_clean(struct nic *nic, unsigned int *work_done, 
		new_before_last_rfd->command |= cpu_to_le16(cb_el);

		pci_dma_sync_single_for_device(nic->pdev,

			new_before_last_rx->dma_addr, sizeof(struct rfd),

			PCI_DMA_TODEVICE);

			PCI_DMA_BIDIRECTIONAL);



		/* Now that we have a new stopping point, we can clear the old

		 * stopping point.  We must sync twice to get the proper
@@ -1951,11 +1951,11 @@ static void e100_rx_clean(struct nic *nic, unsigned int *work_done, 
		old_before_last_rfd->command &= ~cpu_to_le16(cb_el);

		pci_dma_sync_single_for_device(nic->pdev,

			old_before_last_rx->dma_addr, sizeof(struct rfd),

			PCI_DMA_TODEVICE);

			PCI_DMA_BIDIRECTIONAL);

		old_before_last_rfd->size = cpu_to_le16(VLAN_ETH_FRAME_LEN);

		pci_dma_sync_single_for_device(nic->pdev,

			old_before_last_rx->dma_addr, sizeof(struct rfd),

			PCI_DMA_TODEVICE);

			PCI_DMA_BIDIRECTIONAL);

	}



	if(restart_required) {
@@ -1978,7 +1978,7 @@ static void e100_rx_clean_list(struct nic *nic) 
		for(rx = nic->rxs, i = 0; i < count; rx++, i++) {

			if(rx->skb) {

				pci_unmap_single(nic->pdev, rx->dma_addr,

					RFD_BUF_LEN, PCI_DMA_FROMDEVICE);

					RFD_BUF_LEN, PCI_DMA_BIDIRECTIONAL);

				dev_kfree_skb(rx->skb);

			}

		}
@@ -2021,7 +2021,7 @@ static int e100_rx_alloc_list(struct nic *nic) 
	before_last->command |= cpu_to_le16(cb_el);

	before_last->size = 0;

	pci_dma_sync_single_for_device(nic->pdev, rx->dma_addr,

		sizeof(struct rfd), PCI_DMA_TODEVICE);

		sizeof(struct rfd), PCI_DMA_BIDIRECTIONAL);



	nic->rx_to_use = nic->rx_to_clean = nic->rxs;

	nic->ru_running = RU_SUSPENDED;
@@ -2222,7 +2222,7 @@ static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode) 
	msleep(10);



	pci_dma_sync_single_for_cpu(nic->pdev, nic->rx_to_clean->dma_addr,

			RFD_BUF_LEN, PCI_DMA_FROMDEVICE);

			RFD_BUF_LEN, PCI_DMA_BIDIRECTIONAL);



	if(memcmp(nic->rx_to_clean->skb->data + sizeof(struct rfd),

	   skb->data, ETH_DATA_LEN))

drivers/net/e1000/e1000_ethtool.c

+6 −2
Original line number Diff line number Diff line
@@ -1774,7 +1774,8 @@ static void e1000_get_wol(struct net_device *netdev, 


	/* this function will set ->supported = 0 and return 1 if wol is not

	 * supported by this hardware */

	if (e1000_wol_exclusion(adapter, wol))

	if (e1000_wol_exclusion(adapter, wol) ||

	    !device_can_wakeup(&adapter->pdev->dev))

		return;



	/* apply any specific unsupported masks here */
@@ -1811,7 +1812,8 @@ static int e1000_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) 
	if (wol->wolopts & (WAKE_PHY | WAKE_ARP | WAKE_MAGICSECURE))

		return -EOPNOTSUPP;



	if (e1000_wol_exclusion(adapter, wol))

	if (e1000_wol_exclusion(adapter, wol) ||

	    !device_can_wakeup(&adapter->pdev->dev))

		return wol->wolopts ? -EOPNOTSUPP : 0;



	switch (hw->device_id) {
@@ -1838,6 +1840,8 @@ static int e1000_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) 
	if (wol->wolopts & WAKE_MAGIC)

		adapter->wol |= E1000_WUFC_MAG;



	device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);



	return 0;

}