Commit 2a1292b3 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:
  [LRO]: fix lro_gen_skb() alignment
  [TCP]: NAGLE_PUSH seems to be a wrong way around
  [TCP]: Move prior_in_flight collect to more robust place
  [TCP] FRTO: Use of existing funcs make code more obvious & robust
  [IRDA]: Move ircomm_tty_line_info() under #ifdef CONFIG_PROC_FS
  [ROSE]: Trivial compilation CONFIG_INET=n case
  [IPVS]: Fix sched registration race when checking for name collision.
  [IPVS]: Don't leak sysctl tables if the scheduler registration fails.
parents 2cfae273 621544eb

drivers/net/myri10ge/myri10ge.c

+1 −0
Original line number Diff line number Diff line
@@ -1979,6 +1979,7 @@ static int myri10ge_open(struct net_device *dev) 
	lro_mgr->lro_arr = mgp->rx_done.lro_desc;

	lro_mgr->get_frag_header = myri10ge_get_frag_header;

	lro_mgr->max_aggr = myri10ge_lro_max_pkts;

	lro_mgr->frag_align_pad = 2;

	if (lro_mgr->max_aggr > MAX_SKB_FRAGS)

		lro_mgr->max_aggr = MAX_SKB_FRAGS;

include/linux/inet_lro.h

+3 −0
Original line number Diff line number Diff line
@@ -91,6 +91,9 @@ struct net_lro_mgr { 
	int max_desc; /* Max number of LRO descriptors  */

	int max_aggr; /* Max number of LRO packets to be aggregated */



	int frag_align_pad; /* Padding required to properly align layer 3

			     * headers in generated skb when using frags */



	struct net_lro_desc *lro_arr; /* Array of LRO descriptors */



	/*

net/ipv4/inet_lro.c

+2 −1
Original line number Diff line number Diff line
@@ -401,10 +401,11 @@ static struct sk_buff *lro_gen_skb(struct net_lro_mgr *lro_mgr, 
	int data_len = len;

	int hdr_len = min(len, hlen);



	skb = netdev_alloc_skb(lro_mgr->dev, hlen);

	skb = netdev_alloc_skb(lro_mgr->dev, hlen + lro_mgr->frag_align_pad);

	if (!skb)

		return NULL;



	skb_reserve(skb, lro_mgr->frag_align_pad);

	skb->len = len;

	skb->data_len = len - hdr_len;

	skb->truesize += true_size;

net/ipv4/ipvs/ip_vs_lblc.c

+6 −1
Original line number Diff line number Diff line
@@ -580,9 +580,14 @@ static struct ip_vs_scheduler ip_vs_lblc_scheduler = 


static int __init ip_vs_lblc_init(void)

{

	int ret;



	INIT_LIST_HEAD(&ip_vs_lblc_scheduler.n_list);

	sysctl_header = register_sysctl_table(lblc_root_table);

	return register_ip_vs_scheduler(&ip_vs_lblc_scheduler);

	ret = register_ip_vs_scheduler(&ip_vs_lblc_scheduler);

	if (ret)

		unregister_sysctl_table(sysctl_header);

	return ret;

}

net/ipv4/ipvs/ip_vs_lblcr.c

+6 −1
Original line number Diff line number Diff line
@@ -769,9 +769,14 @@ static struct ip_vs_scheduler ip_vs_lblcr_scheduler = 


static int __init ip_vs_lblcr_init(void)

{

	int ret;



	INIT_LIST_HEAD(&ip_vs_lblcr_scheduler.n_list);

	sysctl_header = register_sysctl_table(lblcr_root_table);

	return register_ip_vs_scheduler(&ip_vs_lblcr_scheduler);

	ret = register_ip_vs_scheduler(&ip_vs_lblcr_scheduler);

	if (ret)

		unregister_sysctl_table(sysctl_header);

	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE