treewide: Remove trailing whitespace

[sliver-openvswitch.git] / datapath / flow.c

diff --git a/datapath/flow.c b/datapath/flow.c
index 5f122bb..dbfe5dd 100644 (file)
--- a/datapath/flow.c
+++ b/datapath/flow.c
@@ -153,7 +153,7 @@ void flow_deferred_free(struct sw_flow *flow)
 /* RCU callback used by flow_deferred_free_acts. */
 static void rcu_free_acts_callback(struct rcu_head *rcu)
 {
-       struct sw_flow_actions *sf_acts = container_of(rcu, 
+       struct sw_flow_actions *sf_acts = container_of(rcu,
                        struct sw_flow_actions, rcu);
        kfree(sf_acts);
 }
@@ -224,6 +224,18 @@ static __be16 parse_ethertype(struct sk_buff *skb)
  *
  * Returns 0 if successful, otherwise a negative errno value.
  *
+ * Initializes @skb header pointers as follows:
+ *
+ *    - skb->mac_header: the Ethernet header.
+ *
+ *    - skb->network_header: just past the Ethernet header, or just past the
+ *      VLAN header, to the first byte of the Ethernet payload.
+ *
+ *    - skb->transport_header: If key->dl_type is ETH_P_IP on output, then just
+ *      past the IPv4 header, if one is present and of a correct length,
+ *      otherwise the same as skb->network_header.  For other key->dl_type
+ *      values it is left untouched.
+ *
  * Sets OVS_CB(skb)->is_frag to %true if @skb is an IPv4 fragment, otherwise to
  * %false.
  */
@@ -299,22 +311,12 @@ int flow_extract(struct sk_buff *skb, u16 in_port, struct odp_flow_key *key)
                                        struct tcphdr *tcp = tcp_hdr(skb);
                                        key->tp_src = tcp->source;
                                        key->tp_dst = tcp->dest;
-                               } else {
-                                       /* Avoid tricking other code into
-                                        * thinking that this packet has an L4
-                                        * header. */
-                                       key->nw_proto = 0;
                                }
                        } else if (key->nw_proto == IPPROTO_UDP) {
                                if (udphdr_ok(skb)) {
                                        struct udphdr *udp = udp_hdr(skb);
                                        key->tp_src = udp->source;
                                        key->tp_dst = udp->dest;
-                               } else {
-                                       /* Avoid tricking other code into
-                                        * thinking that this packet has an L4
-                                        * header. */
-                                       key->nw_proto = 0;
                                }
                        } else if (key->nw_proto == IPPROTO_ICMP) {
                                if (icmphdr_ok(skb)) {
@@ -324,11 +326,6 @@ int flow_extract(struct sk_buff *skb, u16 in_port, struct odp_flow_key *key)
                                         * in 16-bit network byte order. */
                                        key->tp_src = htons(icmp->type);
                                        key->tp_dst = htons(icmp->code);
-                               } else {
-                                       /* Avoid tricking other code into
-                                        * thinking that this packet has an L4
-                                        * header. */
-                                       key->nw_proto = 0;
                                }
                        }
                } else {
@@ -349,14 +346,12 @@ int flow_extract(struct sk_buff *skb, u16 in_port, struct odp_flow_key *key)
                                key->nw_proto = ntohs(arp->ar_op);
                        }
 
-                       if (key->nw_proto == ARPOP_REQUEST 
+                       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);
        }
        return 0;
 }