[9610] wlbt: remove tcp_get_info() in ack suppression and re-enable.

Workaround TCP ack suppression

Change-Id: Id85be7c977675d9f6fd55d3534b22e8f680dfbab
SCSC-Bug-Id: SSB-41049
Signed-off-by: Ivan Priest <i.priest@samsung.com>

diff --git a/drivers/net/wireless/scsc/netif.c b/drivers/net/wireless/scsc/netif.c
index dd8c9fb05a3e3881f341fcee2d356a402b739690..d7e7ba7ee9d588fb769283db5fe241ce2afd684d 100755 (executable)
--- a/drivers/net/wireless/scsc/netif.c
+++ b/drivers/net/wireless/scsc/netif.c
@@ -51,7 +51,7 @@
 #define CS0            0x00
 
 #ifndef CONFIG_ARM
-static bool tcp_ack_suppression_disable = true;
+static bool tcp_ack_suppression_disable;
 module_param(tcp_ack_suppression_disable, bool, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(tcp_ack_suppression_disable, "Disable TCP ack suppression feature");
 
@@ -1732,10 +1732,11 @@ static struct sk_buff *slsi_netif_tcp_ack_suppression_pkt(struct net_device *dev
                ndev_vif->last_tcp_ack = tcp_ack;
        }
 
+#if 0
        /* TCP socket diagnostics */
        if (tcp_ack->tcp_sk)
                tcp_get_info(tcp_ack->tcp_sk, &tcp_ack->tcp_sock_info);
-
+#endif
        /* If it is a DUP Ack, send straight away without flushing the cache. */
        if (be32_to_cpu(tcp_hdr(skb)->ack_seq) < tcp_ack->ack_seq) {
                /* check for wrap-around */
@@ -1750,7 +1751,7 @@ static struct sk_buff *slsi_netif_tcp_ack_suppression_pkt(struct net_device *dev
        /* Has data, forward straight away. */
        if (be16_to_cpu(ip_hdr(skb)->tot_len) > ((ip_hdr(skb)->ihl * 4) + (tcp_hdr(skb)->doff * 4))) {
                SCSC_HIP4_SAMPLER_TCP_DATA(ndev_vif->sdev->minor_prof, tcp_ack->stream_id, be32_to_cpu(tcp_hdr(skb)->seq));
-               SCSC_HIP4_SAMPLER_TCP_CWND(ndev_vif->sdev->minor_prof, tcp_ack->stream_id, tcp_ack->tcp_sock_info.tcpi_snd_cwnd);
+               /* SCSC_HIP4_SAMPLER_TCP_CWND(ndev_vif->sdev->minor_prof, tcp_ack->stream_id, tcp_ack->tcp_sock_info.tcpi_snd_cwnd); */
                SCSC_HIP4_SAMPLER_TCP_SEND_BUF(ndev_vif->sdev->minor_prof, tcp_ack->stream_id, sysctl_tcp_wmem[2]);
                ndev_vif->tcp_ack_stats.tack_hasdata++;
                forward_now = 1;