diff options
| author | Marek Lindner <lindner_marek@yahoo.de> | 2010-05-07 21:47:20 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 13:42:39 -0700 |
| commit | 1d59f82cb876ee9a1b4adc4f9b1063b855eac015 (patch) | |
| tree | 3d80bf12b303a178bad89b45512a715602957bc5 /drivers/staging/batman-adv/send.c | |
| parent | 147412406a200a9a3230fad1e0e99c818e873680 (diff) | |
| download | op-kernel-dev-1d59f82cb876ee9a1b4adc4f9b1063b855eac015.zip op-kernel-dev-1d59f82cb876ee9a1b4adc4f9b1063b855eac015.tar.gz | |
Staging: batman-adv: move originator interval setting from /proc to /sys
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/batman-adv/send.c')
| -rw-r--r-- | drivers/staging/batman-adv/send.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/batman-adv/send.c b/drivers/staging/batman-adv/send.c index a00aa88..de2344a 100644 --- a/drivers/staging/batman-adv/send.c +++ b/drivers/staging/batman-adv/send.c @@ -36,10 +36,10 @@ static uint8_t hop_penalty(const uint8_t tq) } /* when do we schedule our own packet to be sent */ -static unsigned long own_send_time(void) +static unsigned long own_send_time(struct bat_priv *bat_priv) { return jiffies + - (((atomic_read(&originator_interval) - JITTER + + (((atomic_read(&bat_priv->orig_interval) - JITTER + (random32() % 2*JITTER)) * HZ) / 1000); } @@ -277,7 +277,7 @@ void schedule_own_packet(struct batman_if *batman_if) atomic_inc(&batman_if->seqno); slide_own_bcast_window(batman_if); - send_time = own_send_time(); + send_time = own_send_time(bat_priv); add_bat_packet_to_list(bat_priv, batman_if->packet_buff, batman_if->packet_len, |
