A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-31 04:01:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

net: remove redundant check for timer pending state before del_timer

Browse source 
As in del_timer() there has already placed a timer_pending() function
to check whether the timer to be deleted is pending or not, it's
unnecessary to check timer pending state again before del_timer() is
called.

Signed-off-by: Ying Xue <[email protected]>
Cc: Eric Dumazet <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
Ying Xue 2013-02-03 20:32:57 +00:00 • committed by David S. Miller
commit 25cc4ae913
11 changed files with 21 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

12
net/ipv4/netfilter/ipt_ULOG.c
View file

@ -88,10 +88,8 @@ static void ulog_send(unsigned int nlgroupnum)
{
ulog_buff_t *ub = &ulog_buffers[nlgroupnum];
if (timer_pending(&ub->timer)) {
pr_debug("ulog_send: timer was pending, deleting\n");
del_timer(&ub->timer);
}
pr_debug("ulog_send: timer is deleting\n");
del_timer(&ub->timer);
if (!ub->skb) {
pr_debug("ulog_send: nothing to send\n");
@ -426,10 +424,8 @@ static void __exit ulog_tg_exit(void)
/* remove pending timers and free allocated skb's */
for (i = 0; i < ULOG_MAXNLGROUPS; i++) {
ub = &ulog_buffers[i];
if (timer_pending(&ub->timer)) {
pr_debug("timer was pending, deleting\n");
del_timer(&ub->timer);
}
pr_debug("timer is deleting\n");
del_timer(&ub->timer);
if (ub->skb) {
kfree_skb(ub->skb);