Commit 2a4f739d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [BRIDGE]: correct print message typo
  [TCP] H-TCP: fix integer overflow
  [TCP] cubic: scaling error
parents 0bb78c37 1842c4be

net/bridge/br_sysfs_br.c

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ int br_sysfs_addbr(struct net_device *dev) 


	err = sysfs_create_bin_file(brobj, &bridge_forward);

	if (err) {

		pr_info("%s: can't create attribue file %s/%s\n",

		pr_info("%s: can't create attribute file %s/%s\n",

			__FUNCTION__, dev->name, bridge_forward.attr.name);

		goto out2;

	}

net/ipv4/tcp_cubic.c

+3 −3
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ static inline void bictcp_update(struct bictcp *ca, u32 cwnd) 
         */



	/* change the unit from HZ to bictcp_HZ */

        t = ((tcp_time_stamp + ca->delay_min - ca->epoch_start)

        t = ((tcp_time_stamp + (ca->delay_min>>3) - ca->epoch_start)

	     << BICTCP_HZ) / HZ;



        if (t < ca->bic_K)		/* t - K */
@@ -259,7 +259,7 @@ static inline void measure_delay(struct sock *sk) 
	    (s32)(tcp_time_stamp - ca->epoch_start) < HZ)

		return;



	delay = tcp_time_stamp - tp->rx_opt.rcv_tsecr;

	delay = (tcp_time_stamp - tp->rx_opt.rcv_tsecr)<<3;

	if (delay == 0)

		delay = 1;
@@ -366,7 +366,7 @@ static int __init cubictcp_register(void) 


	beta_scale = 8*(BICTCP_BETA_SCALE+beta)/ 3 / (BICTCP_BETA_SCALE - beta);



	cube_rtt_scale = (bic_scale << 3) / 10;	/* 1024*c/rtt */

	cube_rtt_scale = (bic_scale * 10);	/* 1024*c/rtt */



	/* calculate the "K" for (wmax-cwnd) = c/rtt * K^3

	 *  so K = cubic_root( (wmax-cwnd)*rtt/c )

net/ipv4/tcp_htcp.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ module_param(use_bandwidth_switch, int, 0644); 
MODULE_PARM_DESC(use_bandwidth_switch, "turn on/off bandwidth switcher");



struct htcp {

	u16	alpha;		/* Fixed point arith, << 7 */

	u32	alpha;		/* Fixed point arith, << 7 */

	u8	beta;           /* Fixed point arith, << 7 */

	u8	modeswitch;     /* Delay modeswitch until we had at least one congestion event */

	u32	last_cong;	/* Time since last congestion event end */