From: Justin Pettit <jpettit@nicira.com>
Date: Sun, 30 Mar 2008 08:37:33 +0000 (-0700)
Subject: Fixed some space/tab issues.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=005486c77370632b37f659293d1f8efa72d1526a;p=openvswitch

Fixed some space/tab issues.
---

diff --git a/datapath/flow.c b/datapath/flow.c
index 1807db30..a755947b 100644
--- a/datapath/flow.c
+++ b/datapath/flow.c
@@ -225,12 +225,12 @@ void flow_extract(struct sk_buff *skb, uint16_t in_port,
 	}
 
 	/* Check for a VLAN tag */
-	if (likely(key->dl_type != __constant_htons(ETH_P_8021Q))) {
-		key->dl_vlan = __constant_htons(OFP_VLAN_NONE);
+	if (likely(key->dl_type != htons(ETH_P_8021Q))) {
+		key->dl_vlan = htons(OFP_VLAN_NONE);
 	} else {
 		struct vlan_hdr *vh = (struct vlan_hdr *)(skb_mac_header(skb) + nh_ofs);
 		key->dl_type = vh->h_vlan_encapsulated_proto;
-		key->dl_vlan = vh->h_vlan_TCI & __constant_htons(VLAN_VID_MASK);
+		key->dl_vlan = vh->h_vlan_TCI & htons(VLAN_VID_MASK);
 		nh_ofs += sizeof(*vh);
 	}
 	memcpy(key->dl_src, mac->h_source, ETH_ALEN);
@@ -279,7 +279,7 @@ void flow_extract(struct sk_buff *skb, uint16_t in_port,
 			goto no_th;
 		}
 	} else {
-                /* Fall through. */
+		/* Fall through. */
 	}
 
 	key->nw_src = 0;
diff --git a/datapath/snap.h b/datapath/snap.h
index 5eee1dc7..02ff18f2 100644
--- a/datapath/snap.h
+++ b/datapath/snap.h
@@ -8,25 +8,25 @@
 
 struct snap_hdr
 {
-    uint8_t  dsap;  /* Always 0xAA */
-    uint8_t  ssap;  /* Always 0xAA */
-    uint8_t  ctrl;
-    uint8_t  oui[SNAP_OUI_LEN];
-    uint16_t ethertype;
+	uint8_t  dsap;  /* Always 0xAA */
+	uint8_t  ssap;  /* Always 0xAA */
+	uint8_t  ctrl;
+	uint8_t  oui[SNAP_OUI_LEN];
+	uint16_t ethertype;
 } __attribute__ ((packed));
 
 static inline int snap_get_ethertype(struct sk_buff *skb, uint16_t *ethertype)
 {
-    struct snap_hdr *sh = (struct snap_hdr *)(skb->data 
-                        + sizeof(struct ethhdr));
-    if (((sh->dsap & 0xFE) != LLC_SAP_SNAP) 
-                || ((sh->dsap & 0xFE) != LLC_SAP_SNAP)
-                || (!memcmp(sh->oui, "\0\0\0", SNAP_OUI_LEN)))
-        return -EINVAL;
+	struct snap_hdr *sh = (struct snap_hdr *)(skb->data 
+				+ sizeof(struct ethhdr));
+	if (((sh->dsap & 0xFE) != LLC_SAP_SNAP) 
+				|| ((sh->dsap & 0xFE) != LLC_SAP_SNAP)
+				|| (!memcmp(sh->oui, "\0\0\0", SNAP_OUI_LEN)))
+		return -EINVAL;
 
-    *ethertype = sh->ethertype;
+	*ethertype = sh->ethertype;
 
-    return 0;
+	return 0;
 }
 
 #endif /* snap.h */