Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90ca9a2f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* HEAD:
  [DCCP]: Fix sparse warnings.
  [TCP]: Remove TCP Compound
  [BPQ] lockdep: fix false positive
  [IPV4] inetpeer: Get rid of volatile from peer_total
  [AX.25]: Get rid of the last volatile.
parents 2c87e2cd 9faefb6d

drivers/net/hamradio/bpqether.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -122,6 +122,12 @@ struct bpqdev { 




static LIST_HEAD(bpq_devices);

static LIST_HEAD(bpq_devices);





/*

 * bpqether network devices are paired with ethernet devices below them, so

 * form a special "super class" of normal ethernet devices; split their locks

 * off into a separate class since they always nest.

 */

static struct lock_class_key bpq_netdev_xmit_lock_key;





/* ------------------------------------------------------------------------ */

/* ------------------------------------------------------------------------ */
@@ -528,6 +534,7 @@ static int bpq_new_device(struct net_device *edev) 
	err = register_netdevice(ndev);

	err = register_netdevice(ndev);

	if (err)

	if (err)

		goto error;

		goto error;

	lockdep_set_class(&ndev->_xmit_lock, &bpq_netdev_xmit_lock_key);





	/* List protected by RTNL */

	/* List protected by RTNL */

	list_add_rcu(&bpq->bpq_list, &bpq_devices);

	list_add_rcu(&bpq->bpq_list, &bpq_devices);

net/ax25/ax25_in.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -102,8 +102,8 @@ static int ax25_rx_fragment(ax25_cb *ax25, struct sk_buff *skb) 
int ax25_rx_iframe(ax25_cb *ax25, struct sk_buff *skb)

int ax25_rx_iframe(ax25_cb *ax25, struct sk_buff *skb)

{

{

	int (*func)(struct sk_buff *, ax25_cb *);

	int (*func)(struct sk_buff *, ax25_cb *);

	volatile int queued = 0;

	unsigned char pid;

	unsigned char pid;

	int queued = 0;





	if (skb == NULL) return 0;

	if (skb == NULL) return 0;

net/dccp/proto.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -484,7 +484,7 @@ static int do_dccp_setsockopt(struct sock *sk, int level, int optname, 
			err = -EINVAL;

			err = -EINVAL;

		else

		else

			err = dccp_setsockopt_change(sk, DCCPO_CHANGE_L,

			err = dccp_setsockopt_change(sk, DCCPO_CHANGE_L,

					             (struct dccp_so_feat *)

					             (struct dccp_so_feat __user *)

						     optval);

						     optval);

		break;

		break;
@@ -493,7 +493,7 @@ static int do_dccp_setsockopt(struct sock *sk, int level, int optname, 
			err = -EINVAL;

			err = -EINVAL;

		else

		else

			err = dccp_setsockopt_change(sk, DCCPO_CHANGE_R,

			err = dccp_setsockopt_change(sk, DCCPO_CHANGE_R,

						     (struct dccp_so_feat *)

						     (struct dccp_so_feat __user *)

						     optval);

						     optval);

		break;

		break;

net/ipv4/Kconfig

+0 −10
Original line number Original line Diff line number Diff line
@@ -572,16 +572,6 @@ config TCP_CONG_VENO 
	loss packets.

	loss packets.

	See http://www.ntu.edu.sg/home5/ZHOU0022/papers/CPFu03a.pdf

	See http://www.ntu.edu.sg/home5/ZHOU0022/papers/CPFu03a.pdf





config TCP_CONG_COMPOUND

	tristate "TCP Compound"

	depends on EXPERIMENTAL

	default n

	---help---

	TCP Compound is a sender-side only change to TCP that uses

	a mixed Reno/Vegas approach to calculate the cwnd.

	For further details look here:

	  ftp://ftp.research.microsoft.com/pub/tr/TR-2005-86.pdf



endmenu

endmenu





config TCP_CONG_BIC

config TCP_CONG_BIC

net/ipv4/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -47,7 +47,6 @@ obj-$(CONFIG_TCP_CONG_VEGAS) += tcp_vegas.o 
obj-$(CONFIG_TCP_CONG_VENO) += tcp_veno.o

obj-$(CONFIG_TCP_CONG_VENO) += tcp_veno.o

obj-$(CONFIG_TCP_CONG_SCALABLE) += tcp_scalable.o

obj-$(CONFIG_TCP_CONG_SCALABLE) += tcp_scalable.o

obj-$(CONFIG_TCP_CONG_LP) += tcp_lp.o

obj-$(CONFIG_TCP_CONG_LP) += tcp_lp.o

obj-$(CONFIG_TCP_CONG_COMPOUND) += tcp_compound.o





obj-$(CONFIG_XFRM) += xfrm4_policy.o xfrm4_state.o xfrm4_input.o \

obj-$(CONFIG_XFRM) += xfrm4_policy.o xfrm4_state.o xfrm4_input.o \

		      xfrm4_output.o
 
		      xfrm4_output.o