summaryrefslogtreecommitdiffstats
path: root/net/ieee802154
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@datenfreihafen.org>2017-10-18 17:40:18 +0200
committerStefan Schmidt <stefan@datenfreihafen.org>2017-10-18 17:40:18 +0200
commit396665e8320987ff43b20a62a6a1cdae57aa1cc1 (patch)
treebf778eab1ef1c9ff102bb235d9bca1a42bec7d0a /net/ieee802154
parentd01174fcd2c1ffefdd0554f847c4045a5c731591 (diff)
parentb9f1f1ce866c28e3d9b86202441b220244754a69 (diff)
downloadblackbird-op-linux-396665e8320987ff43b20a62a6a1cdae57aa1cc1.tar.gz
blackbird-op-linux-396665e8320987ff43b20a62a6a1cdae57aa1cc1.zip
Merge remote-tracking branch 'net-next/master'
Diffstat (limited to 'net/ieee802154')
-rw-r--r--net/ieee802154/6lowpan/reassembly.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ieee802154/6lowpan/reassembly.c b/net/ieee802154/6lowpan/reassembly.c
index f85b08baff16..85bf86ad6b18 100644
--- 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);
OpenPOWER on IntegriCloud