Skip to content

Commit

Permalink
Staging: batman-adv: fragment forwarded packets
Browse files Browse the repository at this point in the history
If a packet is too big to be forwarded over an interface it will be
fragmented on-the-fly (if fragmentation is enabled).

Signed-off-by: Andreas Langer <an.langer@gmx.de>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Andreas Langer authored and Greg Kroah-Hartman committed Nov 29, 2010
1 parent b8cd754 commit 9061109
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
6 changes: 6 additions & 0 deletions drivers/staging/batman-adv/routing.c
Original file line number Diff line number Diff line change
Expand Up @@ -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--;

Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/batman-adv/unicast.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions drivers/staging/batman-adv/unicast.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_ */

0 comments on commit 9061109

Please sign in to comment.