| Message ID | 20180731154507.5247-1-colin.king@canonical.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | net: ieee802154: 6lowpan: remove redundant pointers 'fq' and 'net' | expand |
Hello. On 07/31/2018 05:45 PM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Pointers fq and net are being assigned but are never used hence they > are redundant and can be removed. > > Cleans up clang warnings: > warning: variable 'fq' set but not used [-Wunused-but-set-variable] > warning: variable 'net' set but not used [-Wunused-but-set-variable] > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > net/ieee802154/6lowpan/reassembly.c | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/net/ieee802154/6lowpan/reassembly.c b/net/ieee802154/6lowpan/reassembly.c > index ec7a5da56129..e7857a8ac86d 100644 > --- a/net/ieee802154/6lowpan/reassembly.c > +++ b/net/ieee802154/6lowpan/reassembly.c > @@ -40,9 +40,6 @@ static int lowpan_frag_reasm(struct lowpan_frag_queue *fq, > static void lowpan_frag_init(struct inet_frag_queue *q, const void *a) > { > const struct frag_lowpan_compare_key *key = a; > - struct lowpan_frag_queue *fq; > - > - fq = container_of(q, struct lowpan_frag_queue, q); > > BUILD_BUG_ON(sizeof(*key) > sizeof(q->key)); > memcpy(&q->key, key, sizeof(*key)); > @@ -52,10 +49,8 @@ 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(frag, struct frag_queue, q); > - net = container_of(fq->q.net, struct net, ieee802154_lowpan.frags); > > spin_lock(&fq->q.lock); > > This patch has been applied to the wpan-next tree and will be part of the next pull request to net-next. Thanks! regards Stefan Schmidt -- To unsubscribe from this list: send the line "unsubscribe linux-wpan" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ieee802154/6lowpan/reassembly.c b/net/ieee802154/6lowpan/reassembly.c index ec7a5da56129..e7857a8ac86d 100644 --- a/net/ieee802154/6lowpan/reassembly.c +++ b/net/ieee802154/6lowpan/reassembly.c @@ -40,9 +40,6 @@ static int lowpan_frag_reasm(struct lowpan_frag_queue *fq, static void lowpan_frag_init(struct inet_frag_queue *q, const void *a) { const struct frag_lowpan_compare_key *key = a; - struct lowpan_frag_queue *fq; - - fq = container_of(q, struct lowpan_frag_queue, q); BUILD_BUG_ON(sizeof(*key) > sizeof(q->key)); memcpy(&q->key, key, sizeof(*key)); @@ -52,10 +49,8 @@ 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(frag, struct frag_queue, q); - net = container_of(fq->q.net, struct net, ieee802154_lowpan.frags); spin_lock(&fq->q.lock);