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

Commit f6ff56cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents fb6d73d3 5a6f294e

include/net/llc_pdu.h

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ static inline void llc_pdu_init_as_test_rsp(struct sk_buff *skb, 


/* LLC Type 1 XID command/response information fields format */

struct llc_xid_info {

	u8 fmt_id;	/* always 0x18 for LLC */

	u8 fmt_id;	/* always 0x81 for LLC */

	u8 type;	/* different if NULL/non-NULL LSAP */

	u8 rw;		/* sender receive window */

};

include/net/tcp.h

+2 −2
Original line number Diff line number Diff line
@@ -552,8 +552,8 @@ extern u32 __tcp_select_window(struct sock *sk); 


/* TCP timestamps are only 32-bits, this causes a slight

 * complication on 64-bit systems since we store a snapshot

 * of jiffies in the buffer control blocks below.  We decidedly

 * only use of the low 32-bits of jiffies and hide the ugly

 * of jiffies in the buffer control blocks below.  We decided

 * to use only the low 32-bits of jiffies and hide the ugly

 * casts with the following macro.

 */

#define tcp_time_stamp		((__u32)(jiffies))

net/ipv4/tcp_input.c

+2 −2
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ static void tcp_rcv_rtt_update(struct tcp_sock *tp, u32 sample, int win_dep) 
		 * are stalled on filesystem I/O.

		 *

		 * Also, since we are only going for a minimum in the

		 * non-timestamp case, we do not smoother things out

		 * non-timestamp case, we do not smooth things out

		 * else with timestamps disabled convergence takes too

		 * long.

		 */
@@ -546,7 +546,7 @@ static void tcp_rtt_estimator(struct sock *sk, const __u32 mrtt) 
	 *

	 * Funny. This algorithm seems to be very broken.

	 * These formulae increase RTO, when it should be decreased, increase

	 * too slowly, when it should be increased fastly, decrease too fastly

	 * too slowly, when it should be increased quickly, decrease too quickly

	 * etc. I guess in BSD RTO takes ONE value, so that it is absolutely

	 * does not matter how to _calculate_ it. Seems, it was trap

	 * that VJ failed to avoid. 8)

net/ipv6/addrconf.c

+3 −2
Original line number Diff line number Diff line
@@ -1045,9 +1045,10 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev, 
			}

#endif

			/* Rule 8: Use longest matching prefix */

			if (hiscore.rule < 8)

			if (hiscore.rule < 8) {

				hiscore.matchlen = ipv6_addr_diff(&ifa_result->addr, daddr);

			score.rule++;

				hiscore.rule++;

			}

			score.matchlen = ipv6_addr_diff(&ifa->addr, daddr);

			if (score.matchlen > hiscore.matchlen) {

				score.rule = 8;

net/ipv6/ipv6_sockglue.c

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ int ipv6_setsockopt(struct sock *sk, int level, int optname, 
	{

		struct ipv6_txoptions *opt;

		if (optlen == 0)

			optval = 0;

			optval = NULL;



		/* hop-by-hop / destination options are privileged option */

		retv = -EPERM;