diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-14 14:41:09 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-14 14:41:09 +1000 |
| commit | 8f461dca826ada7039ad5788df3b6021693de1fb (patch) | |
| tree | 076c45cee3fa04f86939c15a37bd640271d17d8e /drivers/staging/batman-adv/send.h | |
| parent | e8cd7f10007c8ea84f87da143b8972462f06fc2e (diff) | |
| parent | 94c1f90bb0bac8c2b75569a247b89145022c4c24 (diff) | |
Merge remote branch 'staging-next/staging-next'
Conflicts:
drivers/staging/arlan/arlan-main.c
drivers/staging/comedi/drivers/cb_das16_cs.c
drivers/staging/cx25821/cx25821-alsa.c
drivers/staging/dt3155/dt3155_drv.c
drivers/staging/hv/hv.c
drivers/staging/netwave/netwave_cs.c
drivers/staging/rtl8187se/r8180_core.c
drivers/staging/wavelan/wavelan.c
drivers/staging/wavelan/wavelan_cs.c
drivers/staging/wlags49_h2/wl_cs.c
Diffstat (limited to 'drivers/staging/batman-adv/send.h')
| -rw-r--r-- | drivers/staging/batman-adv/send.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/batman-adv/send.h b/drivers/staging/batman-adv/send.h index 5fc6f3417cb6..feaa2fc7f9a1 100644 --- a/drivers/staging/batman-adv/send.h +++ b/drivers/staging/batman-adv/send.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * @@ -33,7 +33,7 @@ void schedule_forward_packet(struct orig_node *orig_node, struct batman_packet *batman_packet, uint8_t directlink, int hna_buff_len, struct batman_if *if_outgoing); -void add_bcast_packet_to_list(struct sk_buff *skb); +int add_bcast_packet_to_list(struct sk_buff *skb); void send_outstanding_bcast_packet(struct work_struct *work); void send_outstanding_bat_packet(struct work_struct *work); -void purge_outstanding_packets(void); +void purge_outstanding_packets(struct batman_if *batman_if); |