Commit 1b63ba8a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

Conflicts:

	drivers/net/wireless/iwlwifi/iwl4965-base.c
parents e35c3269 d420895e

Documentation/networking/s2io.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -83,9 +83,9 @@ Valid range: Limited by memory on system 
Default: 30 

Default: 30 





e. intr_type

e. intr_type

Specifies interrupt type. Possible values 1(INTA), 2(MSI), 3(MSI-X)

Specifies interrupt type. Possible values 0(INTA), 2(MSI-X)

Valid range: 1-3

Valid values: 0, 2

Default: 1 

Default: 2





5.  Performance suggestions

5.  Performance suggestions

General:

General:

drivers/connector/connector.c

+40 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,8 @@ 
#include <linux/moduleparam.h>

#include <linux/moduleparam.h>

#include <linux/connector.h>

#include <linux/connector.h>

#include <linux/mutex.h>

#include <linux/mutex.h>

#include <linux/proc_fs.h>

#include <linux/spinlock.h>





#include <net/sock.h>

#include <net/sock.h>
@@ -403,6 +405,40 @@ static void cn_callback(void *data) 
	mutex_unlock(&notify_lock);

	mutex_unlock(&notify_lock);

}

}





static int cn_proc_show(struct seq_file *m, void *v)

{

	struct cn_queue_dev *dev = cdev.cbdev;

	struct cn_callback_entry *cbq;



	seq_printf(m, "Name            ID\n");



	spin_lock_bh(&dev->queue_lock);



	list_for_each_entry(cbq, &dev->queue_list, callback_entry) {

		seq_printf(m, "%-15s %u:%u\n",

			   cbq->id.name,

			   cbq->id.id.idx,

			   cbq->id.id.val);

	}



	spin_unlock_bh(&dev->queue_lock);



	return 0;

}



static int cn_proc_open(struct inode *inode, struct file *file)

{

	return single_open(file, cn_proc_show, NULL);

}



static const struct file_operations cn_file_ops = {

	.owner   = THIS_MODULE,

	.open    = cn_proc_open,

	.read    = seq_read,

	.llseek  = seq_lseek,

	.release = single_release

};



static int __devinit cn_init(void)

static int __devinit cn_init(void)

{

{

	struct cn_dev *dev = &cdev;

	struct cn_dev *dev = &cdev;
@@ -434,6 +470,8 @@ static int __devinit cn_init(void) 
		return -EINVAL;

		return -EINVAL;

	}

	}





	proc_net_fops_create(&init_net, "connector", S_IRUGO, &cn_file_ops);



	return 0;

	return 0;

}

}
@@ -443,6 +481,8 @@ static void __devexit cn_fini(void) 




	cn_already_initialized = 0;

	cn_already_initialized = 0;





	proc_net_remove(&init_net, "connector");



	cn_del_callback(&dev->id);

	cn_del_callback(&dev->id);

	cn_queue_free_dev(dev->cbdev);

	cn_queue_free_dev(dev->cbdev);

	netlink_kernel_release(dev->nls);

	netlink_kernel_release(dev->nls);

drivers/net/3c59x.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -1768,9 +1768,10 @@ vortex_timer(unsigned long data) 
	case XCVR_MII: case XCVR_NWAY:

	case XCVR_MII: case XCVR_NWAY:

		{

		{

			ok = 1;

			ok = 1;

			spin_lock_bh(&vp->lock);

			/* Interrupts are already disabled */

			spin_lock(&vp->lock);

			vortex_check_media(dev, 0);

			vortex_check_media(dev, 0);

			spin_unlock_bh(&vp->lock);

			spin_unlock(&vp->lock);

		}

		}

		break;

		break;

	  default:					/* Other media types handled by Tx timeouts. */

	  default:					/* Other media types handled by Tx timeouts. */

drivers/net/e100.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1803,6 +1803,8 @@ static int e100_rx_alloc_skb(struct nic *nic, struct rx *rx) 
	if (rx->prev->skb) {

	if (rx->prev->skb) {

		struct rfd *prev_rfd = (struct rfd *)rx->prev->skb->data;

		struct rfd *prev_rfd = (struct rfd *)rx->prev->skb->data;

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

		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);

	}

	}





	return 0;

	return 0;

drivers/net/e1000/e1000_ethtool.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -347,7 +347,7 @@ e1000_set_tso(struct net_device *netdev, u32 data) 
	else

	else

		netdev->features &= ~NETIF_F_TSO;

		netdev->features &= ~NETIF_F_TSO;





	if (data)

	if (data && (adapter->hw.mac_type > e1000_82547_rev_2))

		netdev->features |= NETIF_F_TSO6;

		netdev->features |= NETIF_F_TSO6;

	else

	else

		netdev->features &= ~NETIF_F_TSO6;

		netdev->features &= ~NETIF_F_TSO6;