Commit a376d446 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:
  Revert "NET: Fix locking issues in PPP, 6pack, mkiss and strip line disciplines."
  skbuff.h: Fix comment for NET_IP_ALIGN
  drivers/net: using spin_lock_irqsave() in net_send_packet()
  NET: phy_device, fix lock imbalance
  gre: fix ToS/DiffServ inherit bug
  igb: gcc-3.4.6 fix
  atlx: duplicate testing of MCAST flag
  NET: Fix locking issues in PPP, 6pack, mkiss and strip line disciplines.
  netdev: restore MTU change operation
  netdev: restore MAC address set and validate operations
  sit: fix regression: do not release skb->dst before xmit
  net: ip_push_pending_frames() fix
  net: sk_prot_alloc() should not blindly overwrite memory
parents 6847e154 252aa9d9

drivers/net/8139too.c

+1 −0
Original line number Diff line number Diff line
@@ -908,6 +908,7 @@ static const struct net_device_ops rtl8139_netdev_ops = { 
	.ndo_open		= rtl8139_open,

	.ndo_stop		= rtl8139_close,

	.ndo_get_stats		= rtl8139_get_stats,

	.ndo_change_mtu		= eth_change_mtu,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_mac_address 	= rtl8139_set_mac_address,

	.ndo_start_xmit		= rtl8139_start_xmit,

drivers/net/arm/ixp4xx_eth.c

+3 −1
Original line number Diff line number Diff line
@@ -1142,7 +1142,9 @@ static const struct net_device_ops ixp4xx_netdev_ops = { 
	.ndo_start_xmit = eth_xmit,

	.ndo_set_multicast_list = eth_set_mcast_list,

	.ndo_do_ioctl = eth_ioctl,



	.ndo_change_mtu = eth_change_mtu,

	.ndo_set_mac_address = eth_mac_addr,

	.ndo_validate_addr = eth_validate_addr,

};



static int __devinit eth_init_one(struct platform_device *pdev)

drivers/net/atlx/atl2.c

+1 −1
Original line number Diff line number Diff line
@@ -2071,7 +2071,7 @@ static int atl2_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) 
	if (wol->wolopts & (WAKE_ARP | WAKE_MAGICSECURE))

		return -EOPNOTSUPP;



	if (wol->wolopts & (WAKE_MCAST|WAKE_BCAST|WAKE_MCAST))

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

		return -EOPNOTSUPP;



	/* these settings will always override what we currently have */

drivers/net/cs89x0.c

+4 −3
Original line number Diff line number Diff line
@@ -1524,6 +1524,7 @@ static void net_timeout(struct net_device *dev) 
static int net_send_packet(struct sk_buff *skb, struct net_device *dev)

{

	struct net_local *lp = netdev_priv(dev);

	unsigned long flags;



	if (net_debug > 3) {

		printk("%s: sent %d byte packet of type %x\n",
@@ -1535,7 +1536,7 @@ static int net_send_packet(struct sk_buff *skb, struct net_device *dev) 
                  ask the chip to start transmitting before the

                  whole packet has been completely uploaded. */



	spin_lock_irq(&lp->lock);

	spin_lock_irqsave(&lp->lock, flags);

	netif_stop_queue(dev);



	/* initiate a transmit sequence */
@@ -1549,13 +1550,13 @@ static int net_send_packet(struct sk_buff *skb, struct net_device *dev) 
		 * we're waiting for TxOk, so return 1 and requeue this packet.

		 */



		spin_unlock_irq(&lp->lock);

		spin_unlock_irqrestore(&lp->lock, flags);

		if (net_debug) printk("cs89x0: Tx buffer not free!\n");

		return NETDEV_TX_BUSY;

	}

	/* Write the contents of the packet */

	writewords(dev->base_addr, TX_FRAME_PORT,skb->data,(skb->len+1) >>1);

	spin_unlock_irq(&lp->lock);

	spin_unlock_irqrestore(&lp->lock, flags);

	lp->stats.tx_bytes += skb->len;

	dev->trans_start = jiffies;

	dev_kfree_skb (skb);

drivers/net/ehea/ehea_main.c

+2 −0
Original line number Diff line number Diff line
@@ -3080,7 +3080,9 @@ static const struct net_device_ops ehea_netdev_ops = { 
	.ndo_poll_controller	= ehea_netpoll,

#endif

	.ndo_get_stats		= ehea_get_stats,

	.ndo_change_mtu		= eth_change_mtu,

	.ndo_set_mac_address	= ehea_set_mac_addr,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_multicast_list	= ehea_set_multicast_list,

	.ndo_change_mtu		= ehea_change_mtu,

	.ndo_vlan_rx_register	= ehea_vlan_rx_register,

CRA Git | Maintained and supported by SUSTech CRA and CCSE