datapath: Cleanup tab/space issues in datapath

diff --git a/datapath/actions.c b/datapath/actions.c
index a21bce840797da4946eb149ade5e4b9155496a46..cddb4897d6140264295149f1f1c61900ab48202e 100644 (file)
--- a/datapath/actions.c
+++ b/datapath/actions.c
@@ -307,7 +307,7 @@ do_output(struct datapath *dp, struct sk_buff *skb, int out_port)
        dev = skb->dev = p->dev;
        if (is_dp_dev(dev))
                dp_dev_recv(dev, skb);
-        else
+       else
                dp_xmit_skb(skb);
        return;
 

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 178ff2d845cc9ec7ecf21b872b9a876528358190..4c397670899ee32beae5b86bb8a9eb7f1e3e7a2e 100644 (file)
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -1167,9 +1167,9 @@ static int do_execute(struct datapath *dp, const struct odp_execute *executep)
        skb_reset_mac_header(skb);
        eth = eth_hdr(skb);
 
-    /* Normally, setting the skb 'protocol' field would be handled by a
-     * call to eth_type_trans(), but it assumes there's a sending
-     * device, which we may not have. */
+       /* Normally, setting the skb 'protocol' field would be handled by a
+        * call to eth_type_trans(), but it assumes there's a sending
+        * device, which we may not have. */
        if (ntohs(eth->h_proto) >= 1536)
                skb->protocol = eth->h_proto;
        else

diff --git a/datapath/flow.c b/datapath/flow.c
index ae60617dd27e08a167e6735420a603e580af51c9..16b576ab674fd527c4b4d30aaec23ea94b8bb34f 100644 (file)
--- a/datapath/flow.c
+++ b/datapath/flow.c
@@ -293,22 +293,22 @@ int flow_extract(struct sk_buff *skb, u16 in_port, struct odp_flow_key *key)
 
                arp = (struct arp_eth_header *)skb_network_header(skb);
 
-        if (arp->ar_hrd == htons(1)
-                && arp->ar_pro == htons(ETH_P_IP)
-                && arp->ar_hln == ETH_ALEN
-                && arp->ar_pln == 4) {
-
-            /* We only match on the lower 8 bits of the opcode. */
-            if (ntohs(arp->ar_op) <= 0xff) {
-                key->nw_proto = ntohs(arp->ar_op);
-            }
-
-            if (key->nw_proto == ARPOP_REQUEST 
-                    || key->nw_proto == ARPOP_REPLY) {
-                memcpy(&key->nw_src, arp->ar_sip, sizeof(key->nw_src));
-                memcpy(&key->nw_dst, arp->ar_tip, sizeof(key->nw_dst));
-            }
-        }
+               if (arp->ar_hrd == htons(1)
+                               && arp->ar_pro == htons(ETH_P_IP)
+                               && arp->ar_hln == ETH_ALEN
+                               && arp->ar_pln == 4) {
+
+                       /* We only match on the lower 8 bits of the opcode. */
+                       if (ntohs(arp->ar_op) <= 0xff) {
+                               key->nw_proto = ntohs(arp->ar_op);
+                       }
+
+                       if (key->nw_proto == ARPOP_REQUEST 
+                                       || key->nw_proto == ARPOP_REPLY) {
+                               memcpy(&key->nw_src, arp->ar_sip, sizeof(key->nw_src));
+                               memcpy(&key->nw_dst, arp->ar_tip, sizeof(key->nw_dst));
+                       }
+               }
        } else {
                skb_reset_transport_header(skb);
        }
@@ -337,7 +337,7 @@ void print_flow(const struct odp_flow_key *key)
 {
 #define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
 #define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5]
-    printk("port%04x:vlan%d mac"MAC_FMT"->"MAC_FMT" "
+       printk("port%04x:vlan%d mac"MAC_FMT"->"MAC_FMT" "
           "type%04x proto%d ip%x->%x port%d->%d\n",
           key->in_port, ntohs(key->dl_vlan),
           MAC_ARG(key->dl_src), MAC_ARG(key->dl_dst),