unsigned char ar_tip[4]; /* target IP address */
} __attribute__((packed));
-static inline int arphdr_ok(struct sk_buff *skb)
+static inline bool arphdr_ok(struct sk_buff *skb)
{
int nh_ofs = skb_network_offset(skb);
return pskb_may_pull(skb, nh_ofs + sizeof(struct arp_eth_header));
}
-static inline int iphdr_ok(struct sk_buff *skb)
+static inline bool iphdr_ok(struct sk_buff *skb)
{
int nh_ofs = skb_network_offset(skb);
if (skb->len >= nh_ofs + sizeof(struct iphdr)) {
return (ip_len >= sizeof(struct iphdr)
&& pskb_may_pull(skb, nh_ofs + ip_len));
}
- return 0;
+ return false;
}
-static inline int tcphdr_ok(struct sk_buff *skb)
+static inline bool tcphdr_ok(struct sk_buff *skb)
{
int th_ofs = skb_transport_offset(skb);
if (pskb_may_pull(skb, th_ofs + sizeof(struct tcphdr))) {
return (tcp_len >= sizeof(struct tcphdr)
&& skb->len >= th_ofs + tcp_len);
}
- return 0;
+ return false;
}
-static inline int udphdr_ok(struct sk_buff *skb)
+static inline bool udphdr_ok(struct sk_buff *skb)
{
int th_ofs = skb_transport_offset(skb);
return pskb_may_pull(skb, th_ofs + sizeof(struct udphdr));
}
-static inline int icmphdr_ok(struct sk_buff *skb)
+static inline bool icmphdr_ok(struct sk_buff *skb)
{
int th_ofs = skb_transport_offset(skb);
return pskb_may_pull(skb, th_ofs + sizeof(struct icmphdr));
return llc->ethertype;
}
-/* Parses the Ethernet frame in 'skb', which was received on 'in_port',
- * and initializes 'key' to match. Returns 1 if 'skb' contains an IP
- * fragment, 0 otherwise. */
+/**
+ * flow_extract - extracts a flow key from an Ethernet frame.
+ * @skb: sk_buff that contains the frame, with skb->data pointing to the
+ * Ethernet header
+ * @in_port: port number on which @skb was received.
+ * @key: output flow key
+ *
+ * The caller must ensure that skb->len >= ETH_HLEN.
+ *
+ * Returns 1 if @skb contains an IPv4 fragment, 0 otherwise.
+ */
int flow_extract(struct sk_buff *skb, u16 in_port, struct odp_flow_key *key)
{
struct ethhdr *eth;
key->in_port = in_port;
key->dl_vlan = htons(ODP_VLAN_NONE);
- if (skb->len < sizeof *eth)
- return 0;
- if (!pskb_may_pull(skb, skb->len >= 64 ? 64 : skb->len))
+ if (!pskb_may_pull(skb, min(skb->len, 64u)))
return 0;
skb_reset_mac_header(skb);