android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

batman-adv: simplify bat_ogm_receive API call

Browse Source 
Most of the values in that call are derived from the skb, so we can hand
over the skb instead.

Reported-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
This commit is contained in:
Marek Lindner 2011-12-05 04:01:51 +08:00
parent 76543d14ae
commit 8780dad9e9
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/batman-adv/bat_iv_ogm.c
View File

@ -1140,13 +1140,16 @@ static void bat_ogm_process(const struct ethhdr *ethhdr,
orig_node_free_ref(orig_node); orig_node_free_ref(orig_node);
} }
void bat_ogm_receive(const struct ethhdr *ethhdr, unsigned char *packet_buff, void bat_ogm_receive(struct hard_iface *if_incoming, struct sk_buff *skb)
int packet_len, struct hard_iface *if_incoming)
{ {
struct batman_ogm_packet *batman_ogm_packet; struct batman_ogm_packet *batman_ogm_packet;
int buff_pos = 0; struct ethhdr *ethhdr;
unsigned char *tt_buff; int buff_pos = 0, packet_len;
unsigned char *tt_buff, *packet_buff;
packet_len = skb_headlen(skb);
ethhdr = (struct ethhdr *)skb_mac_header(skb);
packet_buff = skb->data;
batman_ogm_packet = (struct batman_ogm_packet *)packet_buff; batman_ogm_packet = (struct batman_ogm_packet *)packet_buff;
/* unpack the aggregated packets and process them one by one */ /* unpack the aggregated packets and process them one by one */

3
net/batman-adv/bat_ogm.h
View File

@ -29,7 +29,6 @@ void bat_ogm_init_primary(struct hard_iface *hard_iface);
void bat_ogm_update_mac(struct hard_iface *hard_iface); void bat_ogm_update_mac(struct hard_iface *hard_iface);
void bat_ogm_schedule(struct hard_iface *hard_iface, int tt_num_changes); void bat_ogm_schedule(struct hard_iface *hard_iface, int tt_num_changes);
void bat_ogm_emit(struct forw_packet *forw_packet); void bat_ogm_emit(struct forw_packet *forw_packet);
void bat_ogm_receive(const struct ethhdr *ethhdr, unsigned char *packet_buff, void bat_ogm_receive(struct hard_iface *if_incoming, struct sk_buff *skb);
int packet_len, struct hard_iface *if_incoming);
#endif /* _NET_BATMAN_ADV_OGM_H_ */ #endif /* _NET_BATMAN_ADV_OGM_H_ */

4
net/batman-adv/routing.c
View File

@ -272,9 +272,7 @@ int recv_bat_ogm_packet(struct sk_buff *skb, struct hard_iface *hard_iface)
if (skb_linearize(skb) < 0) if (skb_linearize(skb) < 0)
return NET_RX_DROP; return NET_RX_DROP;
ethhdr = (struct ethhdr *)skb_mac_header(skb); bat_ogm_receive(hard_iface, skb);
bat_ogm_receive(ethhdr, skb->data, skb_headlen(skb), hard_iface);
kfree_skb(skb); kfree_skb(skb);
return NET_RX_SUCCESS; return NET_RX_SUCCESS;