Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit f7324acd98ce48fcde9783884ffe8c0b90899e5e

Authored by David S. Miller
1 parent 072256d1f2
Exists in master and in 13 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.15.y, ti-lsk-linux-4.1.y

tcp: Use NET_ADD_STATS instead of NET_ADD_STATS_BH in tcp_event_new_data_sent() 

Can be invoked from non-BH context.

Based upon a patch by Eric Dumazet.

Fixes: f19c29e3e391 ("tcp: snmp stats for Fast Open, SYN rtx, and data pkts")
Reported-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 2 changed files with 3 additions and 2 deletions Side-by-side Diff

... ... @@ -187,6 +187,7 @@
187 187 #define NET_INC_STATS(net, field) SNMP_INC_STATS((net)->mib.net_statistics, field)
188 188 #define NET_INC_STATS_BH(net, field) SNMP_INC_STATS_BH((net)->mib.net_statistics, field)
189 189 #define NET_INC_STATS_USER(net, field) SNMP_INC_STATS_USER((net)->mib.net_statistics, field)
  190 +#define NET_ADD_STATS(net, field, adnd) SNMP_ADD_STATS((net)->mib.net_statistics, field, adnd)
190 191 #define NET_ADD_STATS_BH(net, field, adnd) SNMP_ADD_STATS_BH((net)->mib.net_statistics, field, adnd)
191 192 #define NET_ADD_STATS_USER(net, field, adnd) SNMP_ADD_STATS_USER((net)->mib.net_statistics, field, adnd)
192 193  
net/ipv4/tcp_output.c
Diff comments   View file @ f7324ac
... ... @@ -87,8 +87,8 @@
87 87 tcp_rearm_rto(sk);
88 88 }
89 89  
90   - NET_ADD_STATS_BH(sock_net(sk), LINUX_MIB_TCPORIGDATASENT,
91   - tcp_skb_pcount(skb));
  90 + NET_ADD_STATS(sock_net(sk), LINUX_MIB_TCPORIGDATASENT,
  91 + tcp_skb_pcount(skb));
92 92 }
93 93  
94 94 /* SND.NXT, if window was not shrunk.