From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Sun, 15 Feb 2009 04:46:39 +0000 (-0800)
Subject: tun: Fix merge error
X-Git-Tag: v2.6.30-rc1~662^2~741
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab46d779661d7a03b7aa00279eead5dc3f0b3901;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed