aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tun.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-04-25 20:40:23 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:24:30 -0400
commit4c13eb6657fe9ef7b4dc8f1a405c902e9e5234e0 (patch)
treed338fad7a61824d8c14c079c0be437ea4ad83f01 /drivers/net/tun.c
parent029720f15dcd3c6c16824177cfc486083b229411 (diff)
[ETH]: Make eth_type_trans set skb->dev like the other *_type_trans
One less thing for drivers writers to worry about. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tun.c')
-rw-r--r--drivers/net/tun.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 5643d1e84ed6..a57aa010cb25 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -254,11 +254,11 @@ static __inline__ ssize_t tun_get_user(struct tun_struct *tun, struct iovec *iv,
254 return -EFAULT; 254 return -EFAULT;
255 } 255 }
256 256
257 skb->dev = tun->dev;
258 switch (tun->flags & TUN_TYPE_MASK) { 257 switch (tun->flags & TUN_TYPE_MASK) {
259 case TUN_TUN_DEV: 258 case TUN_TUN_DEV:
260 skb->mac.raw = skb->data; 259 skb->mac.raw = skb->data;
261 skb->protocol = pi.proto; 260 skb->protocol = pi.proto;
261 skb->dev = tun->dev;
262 break; 262 break;
263 case TUN_TAP_DEV: 263 case TUN_TAP_DEV:
264 skb->protocol = eth_type_trans(skb, tun->dev); 264 skb->protocol = eth_type_trans(skb, tun->dev);