From 6a9ee3470814517e13e2b838dee4fcddae8d33e7 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 26 Apr 2011 11:35:01 +0200 Subject: Made new xmit function compatible to 2.6.39 kernels --- quicktun.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'quicktun.c') diff --git a/quicktun.c b/quicktun.c index f57e480..5d9724e 100644 --- a/quicktun.c +++ b/quicktun.c @@ -14,6 +14,7 @@ #include #include "quicktun.h" +#include "compat.h" #define DRV_NAME "quicktun" @@ -66,18 +67,9 @@ static netdev_tx_t quicktun_net_xmit(struct sk_buff *skb, struct net_device *dev remote_addr = rcu_dereference(tun->remote_address); if (likely(remote_addr->addr.sin_addr.s_addr)) { - struct flowi fl = { - .nl_u = { - .ip4_u = { - .saddr = tun->local_address.sin_addr.s_addr, - .daddr = remote_addr->addr.sin_addr.s_addr, - .tos = 0, - } - }, - .proto = IPPROTO_UDP - }; - - if (ip_route_output_key(dev_net(dev), &rt, &fl)) { + rt = ip_route_output_ports(dev_net(dev), NULL, remote_addr->addr.sin_addr.s_addr, tun->local_address.sin_addr.s_addr, + remote_addr->addr.sin_port, tun->local_address.sin_port, IPPROTO_UDP, 0, 0); + if (!rt) { tun->dev->stats.tx_carrier_errors++; goto error; } -- cgit v1.2.3