---

yaml --- r: 228175 b: refs/heads/master c: 9061109 h: refs/heads/master i: 228173: 6d9638c 228171: 163a15f 228167: 4237397 228159: 3581b4f v: v3
git-mirror · Nov 29, 2010 · 8fa7136 · 8fa7136
1 parent 27b8934
commit 8fa7136
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8cd75445e842b11a0a8ff1e763303a575c21c77
+refs/heads/master: 9061109ab18352c73b5dda426043dbb6d5e2dae7
diff --git a/trunk/drivers/staging/batman-adv/routing.c b/trunk/drivers/staging/batman-adv/routing.c
@@ -1165,6 +1165,12 @@ static int route_unicast_packet(struct sk_buff *skb,
 
 	unicast_packet = (struct unicast_packet *)skb->data;
 
+	if (unicast_packet->packet_type == BAT_UNICAST &&
+	    atomic_read(&bat_priv->frag_enabled) &&
+	    skb->len > batman_if->net_dev->mtu)
+		return frag_send_skb(skb, bat_priv, batman_if,
+				     dstaddr);
+
 	/* decrement ttl */
 	unicast_packet->ttl--;
 

diff --git a/trunk/drivers/staging/batman-adv/unicast.c b/trunk/drivers/staging/batman-adv/unicast.c
@@ -206,8 +206,8 @@ int frag_reassemble_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
 	return ret;
 }
 
-static int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
-			 struct batman_if *batman_if, uint8_t dstaddr[])
+int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
+		  struct batman_if *batman_if, uint8_t dstaddr[])
 {
 	struct unicast_packet tmp_uc, *unicast_packet;
 	struct sk_buff *frag_skb;

diff --git a/trunk/drivers/staging/batman-adv/unicast.h b/trunk/drivers/staging/batman-adv/unicast.h
@@ -29,5 +29,7 @@ int frag_reassemble_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
 			struct sk_buff **new_skb);
 void frag_list_free(struct list_head *head);
 int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv);
+int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
+		  struct batman_if *batman_if, uint8_t dstaddr[]);
 
 #endif /* _NET_BATMAN_ADV_UNICAST_H_ */