projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ce3dd39) | 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)
commitab46d779661d7a03b7aa00279eead5dc3f0b3901
treea236f027cec78999581e84b56eae0c27bce31e42tree | snapshot (tar.gz zip)
parentce3dd39595d9d64f4ba6ee8dd24c6269a3b56b6acommit | 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 | blame | history