Skip to contentSkip to conversation

net: atm/mpc: Stop using open-coded timer .data field

PATCH Applied Kees Cook 2 participants 2 messages Oct 24, 2017 – Oct 25, 2017

Subsystems (3)
Networking Network drivers ATM
lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 net: atm/mpc: Stop using open-coded timer .data field

In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using an explicit static variable to hold additional expiration details.

Cc "David S. Miller" <[email protected]>
Cc Bhumika Goyal <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Alexey Dobriyan <[email protected]>
Cc "Reshetova, Elena" <[email protected]>
Cc [email protected]
Signed-off-by Kees Cook <[email protected]>
---
 net/atm/mpc.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
net/atm/mpc.c +6 -4
index b43d99430eb6..883d25778fa4 100644
@@ -95,7 +95,7 @@ static netdev_tx_t mpc_send_packet(struct sk_buff *skb,
 static int mpoa_event_listener(struct notifier_block *mpoa_notifier,
 			       unsigned long event, void *dev);
 static void mpc_timer_refresh(void);
-static void mpc_cache_check(unsigned long checking_time);
+static void mpc_cache_check(struct timer_list *unused);
 
 static struct llc_snap_hdr llc_snap_mpoa_ctrl = {
 	0xaa, 0xaa, 0x03,

@@ -1407,15 +1407,17 @@ static void clean_up(struct k_message *msg, struct mpoa_client *mpc, int action)
 	msg_to_mpoad(msg, mpc);
 }
 
+static unsigned long checking_time;
+
 static void mpc_timer_refresh(void)
 {
 	mpc_timer.expires = jiffies + (MPC_P2 * HZ);
-	mpc_timer.data = mpc_timer.expires;
-	mpc_timer.function = mpc_cache_check;
+	checking_time = mpc_timer.expires;
+	mpc_timer.function = (TIMER_FUNC_TYPE)mpc_cache_check;
 	add_timer(&mpc_timer);
 }
 
-static void mpc_cache_check(unsigned long checking_time)
+static void mpc_cache_check(struct timer_list *unused)
 {
 	struct mpoa_client *mpc = mpcs;
 	static unsigned long previous_resolving_check_time;
Signature · 6 lines
2.7.4


-- 
Kees Cook
Pixel Security
maintainer Applied
#1 lore raw

From: Kees Cook <[email protected]>
Date: Tue, 24 Oct 2017 01:46:45 -0700

Quoted 11 lines

In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using an explicit static variable to hold additional expiration details.

Cc "David S. Miller" <[email protected]>
Cc Bhumika Goyal <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Alexey Dobriyan <[email protected]>
Cc "Reshetova, Elena" <[email protected]>
Cc [email protected]
Signed-off-by Kees Cook <[email protected]>

Applied.