Deleted Added
full compact
if_iwn.c (297531) if_iwn.c (298848)
1/*-
2 * Copyright (c) 2007-2009 Damien Bergamini <damien.bergamini@free.fr>
3 * Copyright (c) 2008 Benjamin Close <benjsc@FreeBSD.org>
4 * Copyright (c) 2008 Sam Leffler, Errno Consulting
5 * Copyright (c) 2011 Intel Corporation
6 * Copyright (c) 2013 Cedric GROSS <c.gross@kreiz-it.fr>
7 * Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
8 *

--- 11 unchanged lines hidden (view full) ---

20 */
21
22/*
23 * Driver for Intel WiFi Link 4965 and 1000/5000/6000 Series 802.11 network
24 * adapters.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2007-2009 Damien Bergamini <damien.bergamini@free.fr>
3 * Copyright (c) 2008 Benjamin Close <benjsc@FreeBSD.org>
4 * Copyright (c) 2008 Sam Leffler, Errno Consulting
5 * Copyright (c) 2011 Intel Corporation
6 * Copyright (c) 2013 Cedric GROSS <c.gross@kreiz-it.fr>
7 * Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
8 *

--- 11 unchanged lines hidden (view full) ---

20 */
21
22/*
23 * Driver for Intel WiFi Link 4965 and 1000/5000/6000 Series 802.11 network
24 * adapters.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/dev/iwn/if_iwn.c 297531 2016-04-03 23:39:58Z adrian $");
28__FBSDID("$FreeBSD: head/sys/dev/iwn/if_iwn.c 298848 2016-04-30 14:41:18Z pfg $");
29
30#include "opt_wlan.h"
31#include "opt_iwn.h"
32
33#include <sys/param.h>
34#include <sys/sockio.h>
35#include <sys/sysctl.h>
36#include <sys/mbuf.h>

--- 6293 unchanged lines hidden (view full) ---

6330 } else
6331 skip_dtim = pmgt->skip_dtim;
6332 if (skip_dtim != 0) {
6333 cmd.flags |= htole16(IWN_PS_SLEEP_OVER_DTIM);
6334 max = pmgt->intval[4];
6335 if (max == (uint32_t)-1)
6336 max = dtim * (skip_dtim + 1);
6337 else if (max > dtim)
29
30#include "opt_wlan.h"
31#include "opt_iwn.h"
32
33#include <sys/param.h>
34#include <sys/sockio.h>
35#include <sys/sysctl.h>
36#include <sys/mbuf.h>

--- 6293 unchanged lines hidden (view full) ---

6330 } else
6331 skip_dtim = pmgt->skip_dtim;
6332 if (skip_dtim != 0) {
6333 cmd.flags |= htole16(IWN_PS_SLEEP_OVER_DTIM);
6334 max = pmgt->intval[4];
6335 if (max == (uint32_t)-1)
6336 max = dtim * (skip_dtim + 1);
6337 else if (max > dtim)
6338 max = (max / dtim) * dtim;
6338 max = rounddown(max, dtim);
6339 } else
6340 max = dtim;
6341 for (i = 0; i < 5; i++)
6342 cmd.intval[i] = htole32(MIN(max, pmgt->intval[i]));
6343
6344 DPRINTF(sc, IWN_DEBUG_RESET, "setting power saving level to %d\n",
6345 level);
6346 return iwn_cmd(sc, IWN_CMD_SET_POWER_MODE, &cmd, sizeof cmd, async);

--- 2689 unchanged lines hidden ---
6339 } else
6340 max = dtim;
6341 for (i = 0; i < 5; i++)
6342 cmd.intval[i] = htole32(MIN(max, pmgt->intval[i]));
6343
6344 DPRINTF(sc, IWN_DEBUG_RESET, "setting power saving level to %d\n",
6345 level);
6346 return iwn_cmd(sc, IWN_CMD_SET_POWER_MODE, &cmd, sizeof cmd, async);

--- 2689 unchanged lines hidden ---