datapath: Fix kernel style issues.

Suggested-by: Sergei Shtylyov <[email protected]>
Signed-off-by: Jesse Gross <[email protected]>

datapath/datapath.c

@@ -400,7 +400,7 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb,
 #endif
 		.snd_portid = upcall_info->portid,
 	};
-	size_t len, plen;
+	size_t len;
 	unsigned int hlen;
 	int err, dp_ifindex;
 
@@ -472,9 +472,12 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb,
 	skb_zerocopy(user_skb, skb, skb->len, hlen);
 
 	/* Pad OVS_PACKET_ATTR_PACKET if linear copy was performed */
-	if (!(dp->user_features & OVS_DP_F_UNALIGNED) &&
-	    (plen = (ALIGN(user_skb->len, NLA_ALIGNTO) - user_skb->len)) > 0)
-		memset(skb_put(user_skb, plen), 0, plen);
+	if (!(dp->user_features & OVS_DP_F_UNALIGNED)) {
+		size_t plen = NLA_ALIGN(user_skb->len) - user_skb->len;
+
+		if (plen > 0)
+			memset(skb_put(user_skb, plen), 0, plen);
+	}
 
 	((struct nlmsghdr *) user_skb->data)->nlmsg_len = user_skb->len;
 

datapath/flow_table.c

@@ -173,7 +173,8 @@ void ovs_flow_free(struct sw_flow *flow, bool deferred)
 		struct sw_flow_mask *mask = flow->mask;
 
 		/* ovs-lock is required to protect mask-refcount and
-		 * mask list. */
+		 * mask list.
+		 */
 		ASSERT_OVSL();
 		BUG_ON(!mask->ref_count);
 		mask->ref_count--;