From 8fa71360940b3064246999fa630371102bb9cfb1 Mon Sep 17 00:00:00 2001
From: Andreas Langer <an.langer@gmx.de>
Date: Mon, 22 Nov 2010 00:55:49 +0100
Subject: [PATCH] --- yaml --- r: 228175 b: refs/heads/master c:
 9061109ab18352c73b5dda426043dbb6d5e2dae7 h: refs/heads/master i:   228173:
 6d9638c2beff96434e46c8769ed88d94171b6cd3   228171:
 163a15f66cc93b7e58f74d4699b8f8958829a0eb   228167:
 4237397d2f87be946f1ccdb3d9a52405165805b0   228159:
 3581b4f762c84ee94339252214ee6082be6dfeed v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/staging/batman-adv/routing.c | 6 ++++++
 trunk/drivers/staging/batman-adv/unicast.c | 4 ++--
 trunk/drivers/staging/batman-adv/unicast.h | 2 ++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 09501f534120..700dde29f583 100644
--- 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
index 9b61d6bc37d6..1e101113b6ff 100644
--- 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
index 57fe2de627a1..12afae618ce2 100644
--- 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
index 5908b01fb1c5..e32b7867a9a4 100644
--- 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_ */