public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Andrew Morton <akpm@osdl.org>
To: Max Krasnyansky <maxk@qualcomm.com>
Cc: davem@davemloft.net, linux-kernel@vger.kernel.org
Subject: Re: [BK] TUN/TAP driver update and fixes for 2.6.BK
Date: Wed, 12 Jan 2005 15:01:29 -0800	[thread overview]
Message-ID: <20050112150129.09601d64.akpm@osdl.org> (raw)
In-Reply-To: <41E5A5DA.1010301@qualcomm.com>

Max Krasnyansky <maxk@qualcomm.com> wrote:
>
> Could one of you please pull TUN/TAP driver updates from my tree

That would be Dave.

Did you see this fly past on netdev?


From: Tommy Christensen <tommy.christensen@tpack.net>

But as stated in bonding.txt, the ARP monitor requires the underlying
driver to update dev->trans_start and dev->last_rx.

The patch below adds the required functionality to the TUN/TAP driver.
Please test if this helps in your case.

Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/drivers/net/tun.c |    2 ++
 1 files changed, 2 insertions(+)

diff -puN drivers/net/tun.c~tun-tan-arp-monitor-support drivers/net/tun.c
--- 25/drivers/net/tun.c~tun-tan-arp-monitor-support	Wed Jan 12 14:56:05 2005
+++ 25-akpm/drivers/net/tun.c	Wed Jan 12 14:56:05 2005
@@ -92,6 +92,7 @@ static int tun_net_xmit(struct sk_buff *
 			goto drop;
 	}
 	skb_queue_tail(&tun->readq, skb);
+	dev->trans_start = jiffies;
 
 	/* Notify and wake up reader process */
 	if (tun->flags & TUN_FASYNC)
@@ -240,6 +241,7 @@ static __inline__ ssize_t tun_get_user(s
 		skb->ip_summed = CHECKSUM_UNNECESSARY;
  
 	netif_rx_ni(skb);
+	tun->dev->last_rx = jiffies;
    
 	tun->stats.rx_packets++;
 	tun->stats.rx_bytes += len;
_


  reply	other threads:[~2005-01-12 22:59 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-01-12 22:34 [BK] TUN/TAP driver update and fixes for 2.6.BK Max Krasnyansky
2005-01-12 23:01 ` Andrew Morton [this message]
2005-01-12 23:14   ` Jeff Garzik
2005-01-12 23:16   ` Max Krasnyansky
2005-01-12 23:26     ` Andrew Morton
2005-01-12 23:40       ` Max Krasnyansky
2005-01-12 23:19 ` Jeff Garzik
2005-01-12 23:50   ` Max Krasnyansky
2005-01-12 23:54     ` Jeff Garzik

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20050112150129.09601d64.akpm@osdl.org \
    --to=akpm@osdl.org \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maxk@qualcomm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox