Staging: batman-adv: Unify sysfs file names with their bat_priv atomics

[firefly-linux-kernel-4.4.55.git] / drivers / staging / batman-adv / unicast.c

diff --git a/drivers/staging/batman-adv/unicast.c b/drivers/staging/batman-adv/unicast.c
index fef8521235f11b64080204286dfe7935ced4f002..5ae959327b489dd597143b9985f14728b3ed061d 100644 (file)
--- a/drivers/staging/batman-adv/unicast.c
+++ b/drivers/staging/batman-adv/unicast.c
@@ -29,13 +29,16 @@
 #include "hard-interface.h"
 
 
-struct sk_buff *frag_merge_packet(struct list_head *head,
-                                 struct frag_packet_list_entry *tfp,
-                                 struct sk_buff *skb)
+static struct sk_buff *frag_merge_packet(struct list_head *head,
+                                        struct frag_packet_list_entry *tfp,
+                                        struct sk_buff *skb)
 {
        struct unicast_frag_packet *up =
                (struct unicast_frag_packet *)skb->data;
        struct sk_buff *tmp_skb;
+       struct unicast_packet *unicast_packet;
+       int hdr_len = sizeof(struct unicast_packet),
+           uni_diff = sizeof(struct unicast_frag_packet) - hdr_len;
 
        /* set skb to the first part and tmp_skb to the second part */
        if (up->flags & UNI_FRAG_HEAD) {
@@ -59,10 +62,15 @@ struct sk_buff *frag_merge_packet(struct list_head *head,
 
        memcpy(skb_put(skb, tmp_skb->len), tmp_skb->data, tmp_skb->len);
        kfree_skb(tmp_skb);
+
+       memmove(skb->data + uni_diff, skb->data, hdr_len);
+       unicast_packet = (struct unicast_packet *) skb_pull(skb, uni_diff);
+       unicast_packet->packet_type = BAT_UNICAST;
+
        return skb;
 }
 
-void frag_create_entry(struct list_head *head, struct sk_buff *skb)
+static void frag_create_entry(struct list_head *head, struct sk_buff *skb)
 {
        struct frag_packet_list_entry *tfp;
        struct unicast_frag_packet *up =
@@ -78,7 +86,7 @@ void frag_create_entry(struct list_head *head, struct sk_buff *skb)
        return;
 }
 
-int frag_create_buffer(struct list_head *head)
+static int frag_create_buffer(struct list_head *head)
 {
        int i;
        struct frag_packet_list_entry *tfp;
@@ -99,7 +107,7 @@ int frag_create_buffer(struct list_head *head)
        return 0;
 }
 
-struct frag_packet_list_entry *frag_search_packet(struct list_head *head,
+static struct frag_packet_list_entry *frag_search_packet(struct list_head *head,
                                                 struct unicast_frag_packet *up)
 {
        struct frag_packet_list_entry *tfp;
@@ -152,8 +160,62 @@ void frag_list_free(struct list_head *head)
        return;
 }
 
-static int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
-                        struct batman_if *batman_if, uint8_t dstaddr[])
+/* frag_reassemble_skb():
+ * returns NET_RX_DROP if the operation failed - skb is left intact
+ * returns NET_RX_SUCCESS if the fragment was buffered (skb_new will be NULL)
+ * or the skb could be reassembled (skb_new will point to the new packet and
+ * skb was freed)
+ */
+int frag_reassemble_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
+                       struct sk_buff **new_skb)
+{
+       unsigned long flags;
+       struct orig_node *orig_node;
+       struct frag_packet_list_entry *tmp_frag_entry;
+       int ret = NET_RX_DROP;
+       struct unicast_frag_packet *unicast_packet =
+               (struct unicast_frag_packet *)skb->data;
+
+       *new_skb = NULL;
+       spin_lock_irqsave(&bat_priv->orig_hash_lock, flags);
+       orig_node = ((struct orig_node *)
+                   hash_find(bat_priv->orig_hash, unicast_packet->orig));
+
+       if (!orig_node) {
+               pr_debug("couldn't find originator in orig_hash\n");
+               goto out;
+       }
+
+       orig_node->last_frag_packet = jiffies;
+
+       if (list_empty(&orig_node->frag_list) &&
+           frag_create_buffer(&orig_node->frag_list)) {
+               pr_debug("couldn't create frag buffer\n");
+               goto out;
+       }
+
+       tmp_frag_entry = frag_search_packet(&orig_node->frag_list,
+                                           unicast_packet);
+
+       if (!tmp_frag_entry) {
+               frag_create_entry(&orig_node->frag_list, skb);
+               ret = NET_RX_SUCCESS;
+               goto out;
+       }
+
+       *new_skb = frag_merge_packet(&orig_node->frag_list, tmp_frag_entry,
+                                    skb);
+       /* if not, merge failed */
+       if (*new_skb)
+               ret = NET_RX_SUCCESS;
+out:
+       spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
+
+       return ret;
+}
+
+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;
@@ -256,7 +318,7 @@ int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv)
        /* copy the destination for faster routing */
        memcpy(unicast_packet->dest, orig_node->orig, ETH_ALEN);
 
-       if (atomic_read(&bat_priv->frag_enabled) &&
+       if (atomic_read(&bat_priv->fragmentation) &&
            data_len + sizeof(struct unicast_packet) >
            batman_if->net_dev->mtu) {
                /* send frag skb decreases ttl */