Merge remote-tracking branch 'net-next/master'

[mirror_ubuntu-bionic-kernel.git] / net / ieee802154 / 6lowpan / reassembly.c

diff --git a/net/ieee802154/6lowpan/reassembly.c b/net/ieee802154/6lowpan/reassembly.c
index f85b08baff160307516d8367a1f60dfc555f3c6c..85bf86ad6b1801066a4252af18b5b511070a9e08 100644 (file)
--- a/net/ieee802154/6lowpan/reassembly.c
+++ b/net/ieee802154/6lowpan/reassembly.c
@@ -80,12 +80,13 @@ static void lowpan_frag_init(struct inet_frag_queue *q, const void *a)
        fq->daddr = *arg->dst;
 }
 
-static void lowpan_frag_expire(unsigned long data)
+static void lowpan_frag_expire(struct timer_list *t)
 {
+       struct inet_frag_queue *frag = from_timer(frag, t, timer);
        struct frag_queue *fq;
        struct net *net;
 
-       fq = container_of((struct inet_frag_queue *)data, struct frag_queue, q);
+       fq = container_of(frag, struct frag_queue, q);
        net = container_of(fq->q.net, struct net, ieee802154_lowpan.frags);
 
        spin_lock(&fq->q.lock);