aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/networking/tuntap.txt
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-04-03 09:08:57 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-04-03 09:08:57 -0400
commit76467874b83835129dc454e3a7a8e5d1186101b0 (patch)
tree162129f0c36c35be4aa323cf00626db0e804c3fc /Documentation/networking/tuntap.txt
parent8628de0583504138551a05ad44ca388467f0f552 (diff)
parent6246b6128bbe34d0752f119cf7c5111c85fe481d (diff)
downloadkernel_samsung_smdk4412-76467874b83835129dc454e3a7a8e5d1186101b0.tar.gz
kernel_samsung_smdk4412-76467874b83835129dc454e3a7a8e5d1186101b0.tar.bz2
kernel_samsung_smdk4412-76467874b83835129dc454e3a7a8e5d1186101b0.zip
Merge branch 'master'
Diffstat (limited to 'Documentation/networking/tuntap.txt')
-rw-r--r--Documentation/networking/tuntap.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/tuntap.txt b/Documentation/networking/tuntap.txt
index ec3d109d787..76750fb9151 100644
--- a/Documentation/networking/tuntap.txt
+++ b/Documentation/networking/tuntap.txt
@@ -138,7 +138,7 @@ This means that you have to read/write IP packets when you are using tun and
ethernet frames when using tap.
5. What is the difference between BPF and TUN/TAP driver?
-BFP is an advanced packet filter. It can be attached to existing
+BPF is an advanced packet filter. It can be attached to existing
network interface. It does not provide a virtual network interface.
A TUN/TAP driver does provide a virtual network interface and it is possible
to attach BPF to this interface.