24ed960abf
This changes all DEFINE_TIMER() callbacks to use a struct timer_list
pointer instead of unsigned long. Since the data argument has already been
removed, none of these callbacks are using their argument currently, so
this renames the argument to "unused".
Done using the following semantic patch:
@match_define_timer@
declarer name DEFINE_TIMER;
identifier _timer, _callback;
@@
DEFINE_TIMER(_timer, _callback);
@change_callback depends on match_define_timer@
identifier match_define_timer._callback;
type _origtype;
identifier _origarg;
@@
void
-_callback(_origtype _origarg)
+_callback(struct timer_list *unused)
{ ... }
Signed-off-by: Kees Cook <keescook@chromium.org>
78 lines
1.8 KiB
C
78 lines
1.8 KiB
C
/*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Copyright Tomi Manninen OH2BNS (oh2bns@sral.fi)
|
|
*/
|
|
#include <linux/types.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/socket.h>
|
|
#include <linux/timer.h>
|
|
#include <net/ax25.h>
|
|
#include <linux/skbuff.h>
|
|
#include <net/netrom.h>
|
|
#include <linux/init.h>
|
|
|
|
static void nr_loopback_timer(struct timer_list *);
|
|
|
|
static struct sk_buff_head loopback_queue;
|
|
static DEFINE_TIMER(loopback_timer, nr_loopback_timer);
|
|
|
|
void __init nr_loopback_init(void)
|
|
{
|
|
skb_queue_head_init(&loopback_queue);
|
|
}
|
|
|
|
static inline int nr_loopback_running(void)
|
|
{
|
|
return timer_pending(&loopback_timer);
|
|
}
|
|
|
|
int nr_loopback_queue(struct sk_buff *skb)
|
|
{
|
|
struct sk_buff *skbn;
|
|
|
|
if ((skbn = alloc_skb(skb->len, GFP_ATOMIC)) != NULL) {
|
|
skb_copy_from_linear_data(skb, skb_put(skbn, skb->len), skb->len);
|
|
skb_reset_transport_header(skbn);
|
|
|
|
skb_queue_tail(&loopback_queue, skbn);
|
|
|
|
if (!nr_loopback_running())
|
|
mod_timer(&loopback_timer, jiffies + 10);
|
|
}
|
|
|
|
kfree_skb(skb);
|
|
return 1;
|
|
}
|
|
|
|
static void nr_loopback_timer(struct timer_list *unused)
|
|
{
|
|
struct sk_buff *skb;
|
|
ax25_address *nr_dest;
|
|
struct net_device *dev;
|
|
|
|
if ((skb = skb_dequeue(&loopback_queue)) != NULL) {
|
|
nr_dest = (ax25_address *)(skb->data + 7);
|
|
|
|
dev = nr_dev_get(nr_dest);
|
|
|
|
if (dev == NULL || nr_rx_frame(skb, dev) == 0)
|
|
kfree_skb(skb);
|
|
|
|
if (dev != NULL)
|
|
dev_put(dev);
|
|
|
|
if (!skb_queue_empty(&loopback_queue) && !nr_loopback_running())
|
|
mod_timer(&loopback_timer, jiffies + 10);
|
|
}
|
|
}
|
|
|
|
void __exit nr_loopback_clear(void)
|
|
{
|
|
del_timer_sync(&loopback_timer);
|
|
skb_queue_purge(&loopback_queue);
|
|
}
|