#
# Configuration for 802.1Q VLAN support
#

config VLAN_8021Q
	tristate "802.1Q/802.1ad VLAN Support"
	---help---
	  Select this and you will be able to create 802.1Q VLAN interfaces
	  on your Ethernet interfaces. 802.1Q VLAN supports almost
	  everything a regular Ethernet interface does, including
	  firewalling, bridging, and of course IP traffic. You will need
	  the 'ip' utility in order to effectively use VLANs.
	  See the VLAN web page for more information:
	  <http://www.candelatech.com/~greear/vlan.html>

	  To compile this code as a module, choose M here: the module
	  will be called 8021q.

	  If unsure, say N.

config VLAN_8021Q_GVRP
	bool "GVRP (GARP VLAN Registration Protocol) support"
	depends on VLAN_8021Q
	select GARP
	help
	  Select this to enable GVRP end-system support. GVRP is used for
	  automatic propagation of registered VLANs to switches.

	  If unsure, say N.

config VLAN_8021Q_MVRP
	bool "MVRP (Multiple VLAN Registration Protocol) support"
	depends on VLAN_8021Q
	select MRP
	help
	  Select this to enable MVRP end-system support. MVRP is used for
	  automatic propagation of registered VLANs to switches; it
	  supersedes GVRP and is not backwards-compatible.

	  If unsure, say N.
remove' selected='selected'>nds-private-remove</option>
<option value='packet-loop-back'>packet-loop-back</option>
<option value='packet-rx-pump-back'>packet-rx-pump-back</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>net-next plumbings</td><td class='sub right'>Tobias Klauser</td></tr></table>
<table class='tabs'><tr><td>
<a href='/cgit.cgi/linux/net-next.git/?h=nds-private-remove'>summary</a><a href='/cgit.cgi/linux/net-next.git/refs/?h=nds-private-remove&amp;id=4759d386d55fef452d692bf101167914437e848e'>refs</a><a href='/cgit.cgi/linux/net-next.git/log/net/mac80211/pm.c?h=nds-private-remove'>log</a><a href='/cgit.cgi/linux/net-next.git/tree/net/mac80211/pm.c?h=nds-private-remove&amp;id=4759d386d55fef452d692bf101167914437e848e'>tree</a><a class='active' href='/cgit.cgi/linux/net-next.git/commit/net/mac80211/pm.c?h=nds-private-remove&amp;id=4759d386d55fef452d692bf101167914437e848e'>commit</a><a href='/cgit.cgi/linux/net-next.git/diff/net/mac80211/pm.c?h=nds-private-remove&amp;id=4759d386d55fef452d692bf101167914437e848e'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit.cgi/linux/net-next.git/log/net/mac80211/pm.c'>
<input type='hidden' name='h' value='nds-private-remove'/><input type='hidden' name='id' value='4759d386d55fef452d692bf101167914437e848e'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit.cgi/linux/net-next.git/commit/?h=nds-private-remove&amp;id=4759d386d55fef452d692bf101167914437e848e'>root</a>/<a href='/cgit.cgi/linux/net-next.git/commit/net?h=nds-private-remove&amp;id=4759d386d55fef452d692bf101167914437e848e'>net</a>/<a href='/cgit.cgi/linux/net-next.git/commit/net/mac80211?h=nds-private-remove&amp;id=4759d386d55fef452d692bf101167914437e848e'>mac80211</a>/<a href='/cgit.cgi/linux/net-next.git/commit/net/mac80211/pm.c?h=nds-private-remove&amp;id=4759d386d55fef452d692bf101167914437e848e'>pm.c</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='h' value='nds-private-remove'/><input type='hidden' name='id' value='4759d386d55fef452d692bf101167914437e848e'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Linus Torvalds &lt;torvalds@linux-foundation.org&gt;</td><td class='right'>2017-01-01 12:27:05 -0800</td></tr>
<tr><th>committer</th><td>Linus Torvalds &lt;torvalds@linux-foundation.org&gt;</td><td class='right'>2017-01-01 12:27:05 -0800</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/net/mac80211/pm.c?h=nds-private-remove&amp;id=4759d386d55fef452d692bf101167914437e848e'>4759d386d55fef452d692bf101167914437e848e</a> (<a href='/cgit.cgi/linux/net-next.git/patch/net/mac80211/pm.c?id=4759d386d55fef452d692bf101167914437e848e'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/tree/?h=nds-private-remove&amp;id=4759d386d55fef452d692bf101167914437e848e'>e7109c192ec589fcea2a98f9702aa3c0e4009581</a> /<a href='/cgit.cgi/linux/net-next.git/tree/net/mac80211/pm.c?h=nds-private-remove&amp;id=4759d386d55fef452d692bf101167914437e848e'>net/mac80211/pm.c</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/net/mac80211/pm.c?h=nds-private-remove&amp;id=238d1d0f79f619d75c2cc741d6770fb0986aef24'>238d1d0f79f619d75c2cc741d6770fb0986aef24</a> (<a href='/cgit.cgi/linux/net-next.git/diff/net/mac80211/pm.c?h=nds-private-remove&amp;id=4759d386d55fef452d692bf101167914437e848e&amp;id2=238d1d0f79f619d75c2cc741d6770fb0986aef24'>diff</a>)</td></tr><tr><th>parent</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/net/mac80211/pm.c?h=nds-private-remove&amp;id=1db175428ee374489448361213e9c3b749d14900'>1db175428ee374489448361213e9c3b749d14900</a> (<a href='/cgit.cgi/linux/net-next.git/diff/net/mac80211/pm.c?h=nds-private-remove&amp;id=4759d386d55fef452d692bf101167914437e848e&amp;id2=1db175428ee374489448361213e9c3b749d14900'>diff</a>)</td></tr></table>
<div class='commit-subject'>Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm</div><div class='commit-msg'>Pull DAX updates from Dan Williams:
 "The completion of Jan's DAX work for 4.10.

  As I mentioned in the libnvdimm-for-4.10 pull request, these are some
  final fixes for the DAX dirty-cacheline-tracking invalidation work
  that was merged through the -mm, ext4, and xfs trees in -rc1. These
  patches were prepared prior to the merge window, but we waited for
  4.10-rc1 to have a stable merge base after all the prerequisites were
  merged.

  Quoting Jan on the overall changes in these patches:

     "So I'd like all these 6 patches to go for rc2. The first three
      patches fix invalidation of exceptional DAX entries (a bug which
      is there for a long time) - without these patches data loss can
      occur on power failure even though user called fsync(2). The other
      three patches change locking of DAX faults so that -&gt;iomap_begin()
      is called in a more relaxed locking context and we are safe to
      start a transaction there for ext4"

  These have received a build success notification from the kbuild
  robot, and pass the latest libnvdimm unit tests. There have not been
  any -next releases since -rc1, so they have not appeared there"

* 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  ext4: Simplify DAX fault path
  dax: Call -&gt;iomap_begin without entry lock during dax fault
  dax: Finish fault completely when loading holes
  dax: Avoid page invalidation races and unnecessary radix tree traversals
  mm: Invalidate DAX radix tree entries only if appropriate
  ext2: Return BH_New buffers for zeroed blocks
</div><div class='diffstat-header'><a href='/cgit.cgi/linux/net-next.git/diff/?h=nds-private-remove&amp;id=4759d386d55fef452d692bf101167914437e848e'>Diffstat</a> (limited to 'net/mac80211/pm.c')</div><table summary='diffstat' class='diffstat'>