---

yaml --- r: 219755 b: refs/heads/master c: b411d49 h: refs/heads/master i: 219753: b9cd499 219751: 7051f0c v: v3
git-mirror · Sep 5, 2010 · 08384f2 · 08384f2
1 parent 9710524
commit 08384f2
Show file tree

Hide file tree

Showing 6 changed files with 134 additions and 97 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b706007b8903bb3a6ada97665653ba522ae49bb2
+refs/heads/master: b411d498eeed97ed14a42abeffac2012dd10d971
diff --git a/trunk/drivers/staging/batman-adv/TODO b/trunk/drivers/staging/batman-adv/TODO
@@ -1,5 +1,3 @@
- * Save/cache packets direktly as skb instead of using a normal memory region
-   and copying it in a skb using send_raw_packet and similar functions
  * Request a new review
  * Process the comments from the review
  * Move into mainline proper

diff --git a/trunk/drivers/staging/batman-adv/send.c b/trunk/drivers/staging/batman-adv/send.c
@@ -99,23 +99,6 @@ int send_skb_packet(struct sk_buff *skb,
 	return NET_XMIT_DROP;
 }
 
-/* sends a raw packet. */
-void send_raw_packet(unsigned char *pack_buff, int pack_buff_len,
-		     struct batman_if *batman_if, uint8_t *dst_addr)
-{
-	struct sk_buff *skb;
-	char *data;
-
-	skb = dev_alloc_skb(pack_buff_len + sizeof(struct ethhdr));
-	if (!skb)
-		return;
-	data = skb_put(skb, pack_buff_len + sizeof(struct ethhdr));
-	memcpy(data + sizeof(struct ethhdr), pack_buff, pack_buff_len);
-	/* pull back to the batman "network header" */
-	skb_pull(skb, sizeof(struct ethhdr));
-	send_skb_packet(skb, batman_if, dst_addr);
-}
-
 /* Send a packet to a given interface */
 static void send_packet_to_if(struct forw_packet *forw_packet,
 			      struct batman_if *batman_if)

diff --git a/trunk/drivers/staging/batman-adv/send.h b/trunk/drivers/staging/batman-adv/send.h
@@ -27,8 +27,6 @@
 int send_skb_packet(struct sk_buff *skb,
 				struct batman_if *batman_if,
 				uint8_t *dst_addr);
-void send_raw_packet(unsigned char *pack_buff, int pack_buff_len,
-		     struct batman_if *batman_if, uint8_t *dst_addr);
 void schedule_own_packet(struct batman_if *batman_if);
 void schedule_forward_packet(struct orig_node *orig_node,
 			     struct ethhdr *ethhdr,