3 files changed, 5 insertions, 5 deletions

diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
index 96bcb2ff59ab..de9d1a9473f2 100644
--- a/net/bridge/br_sysfs_br.c
+++ b/net/bridge/br_sysfs_br.c
@@ -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;
         }
diff --git a/net/ipv4/tcp_cubic.c b/net/ipv4/tcp_cubic.c
index a60ef38d75c6..6ad184802266 100644
--- a/net/ipv4/tcp_cubic.c
+++ b/net/ipv4/tcp_cubic.c
@@ -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 )
diff --git a/net/ipv4/tcp_htcp.c b/net/ipv4/tcp_htcp.c
index 682e7d5b6f2f..283be3cb4667 100644
--- a/net/ipv4/tcp_htcp.c
+++ b/net/ipv4/tcp_htcp.c
@@ -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 */