]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 693b3e4) | patch
tun: Fix merge error
authorHerbert Xu <herbert@gondor.apana.org.au>
Sun, 15 Feb 2009 04:46:39 +0000 (20:46 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 15 Feb 2009 04:46:39 +0000 (20:46 -0800)
commit9f7d6e9e1db5d34db2bd1726ebd3af3157bfc3da
treea236f027cec78999581e84b56eae0c27bce31e42tree | snapshot
parent693b3e461e5c8ec6532bd63c999c7bea3fabb5a5commit | diff
tun: Fix merge error

When forward-porting the tun accounting patch I managed to break
the send path compltely by dropping the tun_get call.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/tun.c diff | blob | history
Linux Kernel Source Tree.