Commit c1a13ff5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  NET: add MAINTAINERS entry for ucc_geth driver
  myri10ge: report link up/down in standard ethtool way
  NetXen: Removal of extra free_irq call
  Update tulip maintainer email address
  smc91x: sh solution engine fixes.
  e1000: disable polling before registering netdevice
  network drivers: eliminate unneeded kill_vid code
  atl1: eliminate unneeded kill_vid code
  8139cp: fix VLAN unregistration
  sky2: Fix VLAN unregistration
  VLAN: kill_vid is only useful for VLAN filtering devices
  qla3xxx: device doesnt do hardware checksumming.
parents 7dfb1716 beaf53bf

MAINTAINERS

+8 −1
Original line number Diff line number Diff line
@@ -1487,6 +1487,13 @@ L: linux-usb-devel@lists.sourceforge.net 
L:	linuxppc-embedded@ozlabs.org

S:	Maintained



FREESCALE QUICC ENGINE UCC ETHERNET DRIVER

P:	Li Yang

M:	leoli@freescale.com

L:	netdev@vger.kernel.org

L:	linuxppc-embedded@ozlabs.org

S:	Maintained



FILE LOCKING (flock() and fcntl()/lockf())

P:	Matthew Wilcox

M:	matthew@wil.cx
@@ -3545,7 +3552,7 @@ S: Maintained 


TULIP NETWORK DRIVER

P:	Valerie Henson

M:	val_henson@linux.intel.com

M:	val@nmt.edu

L:	tulip-users@lists.sourceforge.net

W:	http://sourceforge.net/projects/tulip/

S:	Maintained

drivers/net/8139cp.c

+4 −13
Original line number Diff line number Diff line
@@ -435,20 +435,12 @@ static void cp_vlan_rx_register(struct net_device *dev, struct vlan_group *grp) 


	spin_lock_irqsave(&cp->lock, flags);

	cp->vlgrp = grp;

	if (grp)

		cp->cpcmd |= RxVlanOn;

	cpw16(CpCmd, cp->cpcmd);

	spin_unlock_irqrestore(&cp->lock, flags);

}



static void cp_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)

{

	struct cp_private *cp = netdev_priv(dev);

	unsigned long flags;



	spin_lock_irqsave(&cp->lock, flags);

	else

		cp->cpcmd &= ~RxVlanOn;



	cpw16(CpCmd, cp->cpcmd);

	vlan_group_set_device(cp->vlgrp, vid, NULL);

	spin_unlock_irqrestore(&cp->lock, flags);

}

#endif /* CP_VLAN_TAG_USED */
@@ -1944,7 +1936,6 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 
#if CP_VLAN_TAG_USED

	dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;

	dev->vlan_rx_register = cp_vlan_rx_register;

	dev->vlan_rx_kill_vid = cp_vlan_rx_kill_vid;

#endif



	if (pci_using_dac)

drivers/net/acenic.c

+3 −18
Original line number Diff line number Diff line
@@ -480,12 +480,10 @@ static int __devinit acenic_probe_one(struct pci_dev *pdev, 
#if ACENIC_DO_VLAN

	dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;

	dev->vlan_rx_register = ace_vlan_rx_register;

	dev->vlan_rx_kill_vid = ace_vlan_rx_kill_vid;

#endif

	if (1) {



	dev->tx_timeout = &ace_watchdog;

	dev->watchdog_timeo = 5*HZ;

	}



	dev->open = &ace_open;

	dev->stop = &ace_close;
@@ -2283,19 +2281,6 @@ static void ace_vlan_rx_register(struct net_device *dev, struct vlan_group *grp) 
	ace_unmask_irq(dev);

	local_irq_restore(flags);

}





static void ace_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)

{

	struct ace_private *ap = netdev_priv(dev);

	unsigned long flags;



	local_irq_save(flags);

	ace_mask_irq(dev);

	vlan_group_set_device(ap->vlgrp, vid, NULL);

	ace_unmask_irq(dev);

	local_irq_restore(flags);

}

#endif /* ACENIC_DO_VLAN */

drivers/net/acenic.h

+0 −1
Original line number Diff line number Diff line
@@ -787,7 +787,6 @@ static struct net_device_stats *ace_get_stats(struct net_device *dev); 
static int read_eeprom_byte(struct net_device *dev, unsigned long offset);

#if ACENIC_DO_VLAN

static void ace_vlan_rx_register(struct net_device *dev, struct vlan_group *grp);

static void ace_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid);

#endif



#endif /* _ACENIC_H_ */

drivers/net/amd8111e.c

+1 −10
Original line number Diff line number Diff line
@@ -1728,15 +1728,8 @@ static void amd8111e_vlan_rx_register(struct net_device *dev, struct vlan_group 
	lp->vlgrp = grp;

	spin_unlock_irq(&lp->lock);

}



static void amd8111e_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)

{

	struct amd8111e_priv *lp = netdev_priv(dev);

	spin_lock_irq(&lp->lock);

	vlan_group_set_device(lp->vlgrp, vid, NULL);

	spin_unlock_irq(&lp->lock);

}

#endif



static int amd8111e_enable_magicpkt(struct amd8111e_priv* lp)

{

	writel( VAL1|MPPLBA, lp->mmio + CMD3);
@@ -1996,7 +1989,6 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev, 
#if AMD8111E_VLAN_TAG_USED

	dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX ;

	dev->vlan_rx_register =amd8111e_vlan_rx_register;

	dev->vlan_rx_kill_vid = amd8111e_vlan_rx_kill_vid;

#endif



	lp = netdev_priv(dev);
@@ -2049,7 +2041,6 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev, 
#if AMD8111E_VLAN_TAG_USED

	dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;

	dev->vlan_rx_register =amd8111e_vlan_rx_register;

	dev->vlan_rx_kill_vid = amd8111e_vlan_rx_kill_vid;

#endif

	/* Probe the external PHY */

	amd8111e_probe_ext_phy(dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE