Commit 821b03ff 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: (55 commits)
  net: fib_rules: fix error code for unsupported families
  netdevice: Fix wrong string handle in kernel command line parsing
  net: Tyop of sk_filter() comment
  netlink: Unneeded local variable
  net-sched: fix filter destruction in atm/hfsc qdisc destruction
  net-sched: change tcf_destroy_chain() to clear start of filter list
  ipv4: fix sysctl documentation of time related values
  mac80211: don't accept WEP keys other than WEP40 and WEP104
  hostap: fix sparse warnings
  hostap: don't report useless WDS frames by default
  textsearch: fix Boyer-Moore text search bug
  netfilter: nf_conntrack_tcp: fixing to check the lower bound of valid ACK
  ipv6 route: Convert rt6_device_match() to use RT6_LOOKUP_F_xxx flags.
  netlabel: Fix a problem when dumping the default IPv6 static labels
  net/inet_lro: remove setting skb->ip_summed when not LRO-able
  inet fragments: fix race between inet_frag_find and inet_frag_secret_rebuild
  CONNECTOR: add a proc entry to list connectors
  netlink: Fix some doc comments in net/netlink/attr.c
  tcp: /proc/net/tcp rto,ato values not scaled properly (v2)
  include/linux/netdevice.h: don't export MAX_HEADER to userspace
  ...
parents 3d25802e 2fe195cf

Documentation/networking/ip-sysctl.txt

+4 −8
Original line number Diff line number Diff line
@@ -81,23 +81,23 @@ inet_peer_minttl - INTEGER 
	Minimum time-to-live of entries.  Should be enough to cover fragment

	time-to-live on the reassembling side.  This minimum time-to-live  is

	guaranteed if the pool size is less than inet_peer_threshold.

	Measured in jiffies(1).

	Measured in seconds.



inet_peer_maxttl - INTEGER

	Maximum time-to-live of entries.  Unused entries will expire after

	this period of time if there is no memory pressure on the pool (i.e.

	when the number of entries in the pool is very small).

	Measured in jiffies(1).

	Measured in seconds.



inet_peer_gc_mintime - INTEGER

	Minimum interval between garbage collection passes.  This interval is

	in effect under high memory pressure on the pool.

	Measured in jiffies(1).

	Measured in seconds.



inet_peer_gc_maxtime - INTEGER

	Minimum interval between garbage collection passes.  This interval is

	in effect under low (or absent) memory pressure on the pool.

	Measured in jiffies(1).

	Measured in seconds.



TCP variables:
@@ -794,10 +794,6 @@ tag - INTEGER 
	Allows you to write a number, which can be used as required.

	Default value is 0.



(1) Jiffie: internal timeunit for the kernel. On the i386 1/100s, on the

Alpha 1/1024s. See the HZ define in /usr/include/asm/param.h for the exact

value on your system. 



Alexey Kuznetsov.

kuznet@ms2.inr.ac.ru

Documentation/networking/s2io.txt

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



e. intr_type

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

Valid range: 1-3

Default: 1 

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

Valid values: 0, 2

Default: 2



5.  Performance suggestions

General:

drivers/connector/connector.c

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

#include <linux/connector.h>

#include <linux/mutex.h>

#include <linux/proc_fs.h>

#include <linux/spinlock.h>



#include <net/sock.h>
@@ -403,6 +405,40 @@ static void cn_callback(void *data) 
	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)

{

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

	}



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



	return 0;

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


	cn_already_initialized = 0;



	proc_net_remove(&init_net, "connector");



	cn_del_callback(&dev->id);

	cn_queue_free_dev(dev->cbdev);

	netlink_kernel_release(dev->nls);

drivers/net/3c59x.c

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

		{

			ok = 1;

			spin_lock_bh(&vp->lock);

			/* Interrupts are already disabled */

			spin_lock(&vp->lock);

			vortex_check_media(dev, 0);

			spin_unlock_bh(&vp->lock);

			spin_unlock(&vp->lock);

		}

		break;

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

drivers/net/e100.c

+2 −0
Original line number 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) {

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

	}



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE