Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353537
b: refs/heads/master
c: bd085b9
h: refs/heads/master
i:
  353535: d3e4fdc
v: v3
  • Loading branch information
Kees Cook committed Jan 11, 2013
1 parent b721bb1 commit 25f945a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5d0e137dc049c71121119cea4499175a91ed74fd
refs/heads/master: bd085b93851c69e984dc11a9fb359ee388c1e7d2
9 changes: 4 additions & 5 deletions trunk/drivers/net/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,7 @@ config IFB
source "drivers/net/team/Kconfig"

config MACVLAN
tristate "MAC-VLAN support (EXPERIMENTAL)"
depends on EXPERIMENTAL
tristate "MAC-VLAN support"
---help---
This allows one to create virtual interfaces that map packets to
or from specific MAC addresses to a particular interface.
Expand All @@ -138,7 +137,7 @@ config MACVLAN
will be called macvlan.

config MACVTAP
tristate "MAC-VLAN based tap driver (EXPERIMENTAL)"
tristate "MAC-VLAN based tap driver"
depends on MACVLAN
help
This adds a specialized tap character device driver that is based
Expand Down Expand Up @@ -234,8 +233,8 @@ config VETH
versa.

config VIRTIO_NET
tristate "Virtio network driver (EXPERIMENTAL)"
depends on EXPERIMENTAL && VIRTIO
tristate "Virtio network driver"
depends on VIRTIO
---help---
This is the virtual network driver for virtio. It can be used with
lguest or QEMU based VMMs (like KVM or Xen). Say Y or M.
Expand Down

0 comments on commit 25f945a

Please sign in to comment.