Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-block.git] / net / packet / af_packet.c

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 2986941164b1952b3b6014ff81d2986b504c334a..4f4fa323171d45797315eb52af3dde5572e6669f 100644 (file)
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -544,9 +544,7 @@ static void prb_init_blk_timer(struct packet_sock *po,
                struct tpacket_kbdq_core *pkc,
                void (*func) (unsigned long))
 {
-       init_timer(&pkc->retire_blk_timer);
-       pkc->retire_blk_timer.data = (long)po;
-       pkc->retire_blk_timer.function = func;
+       setup_timer(&pkc->retire_blk_timer, func, (long)po);
        pkc->retire_blk_timer.expires = jiffies;
 }