From a0a712110933bfd3675a6368b8507522b1dd70a8 Mon Sep 17 00:00:00 2001
From: Marek Lindner <lindner_marek@yahoo.de>
Date: Mon, 5 Dec 2011 04:01:51 +0800
Subject: [PATCH] --- yaml --- r: 290189 b: refs/heads/master c:
 8780dad9e97f564da0eb3443009c3203122e7e7d h: refs/heads/master i:   290187:
 b836f765ee63bcd20c77d7cf57f3a34193c7e541 v: v3

---
 [refs]                            |  2 +-
 trunk/net/batman-adv/bat_iv_ogm.c | 11 +++++++----
 trunk/net/batman-adv/bat_ogm.h    |  3 +--
 trunk/net/batman-adv/routing.c    |  4 +---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index ce22feae28af..b401f10b4b6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76543d14aec6ce5cb3fc7be9b39c50fcebd2043b
+refs/heads/master: 8780dad9e97f564da0eb3443009c3203122e7e7d
diff --git a/trunk/net/batman-adv/bat_iv_ogm.c b/trunk/net/batman-adv/bat_iv_ogm.c
index d60e1ba0bc15..3402fa575b47 100644
--- a/trunk/net/batman-adv/bat_iv_ogm.c
+++ b/trunk/net/batman-adv/bat_iv_ogm.c
@@ -1140,13 +1140,16 @@ static void bat_ogm_process(const struct ethhdr *ethhdr,
 	orig_node_free_ref(orig_node);
 }
 
-void bat_ogm_receive(const struct ethhdr *ethhdr, unsigned char *packet_buff,
-		     int packet_len, struct hard_iface *if_incoming)
+void bat_ogm_receive(struct hard_iface *if_incoming, struct sk_buff *skb)
 {
 	struct batman_ogm_packet *batman_ogm_packet;
-	int buff_pos = 0;
-	unsigned char *tt_buff;
+	struct ethhdr *ethhdr;
+	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;
 
 	/* unpack the aggregated packets and process them one by one */
diff --git a/trunk/net/batman-adv/bat_ogm.h b/trunk/net/batman-adv/bat_ogm.h
index 69329c107e28..47edfde6f924 100644
--- a/trunk/net/batman-adv/bat_ogm.h
+++ b/trunk/net/batman-adv/bat_ogm.h
@@ -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_schedule(struct hard_iface *hard_iface, int tt_num_changes);
 void bat_ogm_emit(struct forw_packet *forw_packet);
-void bat_ogm_receive(const struct ethhdr *ethhdr, unsigned char *packet_buff,
-		     int packet_len, struct hard_iface *if_incoming);
+void bat_ogm_receive(struct hard_iface *if_incoming, struct sk_buff *skb);
 
 #endif /* _NET_BATMAN_ADV_OGM_H_ */
diff --git a/trunk/net/batman-adv/routing.c b/trunk/net/batman-adv/routing.c
index 4363d197aebc..5bc41c896e35 100644
--- a/trunk/net/batman-adv/routing.c
+++ b/trunk/net/batman-adv/routing.c
@@ -272,9 +272,7 @@ int recv_bat_ogm_packet(struct sk_buff *skb, struct hard_iface *hard_iface)
 	if (skb_linearize(skb) < 0)
 		return NET_RX_DROP;
 
-	ethhdr = (struct ethhdr *)skb_mac_header(skb);
-
-	bat_ogm_receive(ethhdr, skb->data, skb_headlen(skb), hard_iface);
+	bat_ogm_receive(hard_iface, skb);
 
 	kfree_skb(skb);
 	return NET_RX_SUCCESS;