pch_gbe: run the ptp bpf just once per packet

This patch fixes code which needlessly ran the BPF twice per
packet. Instead, we just run the classifier once and test
whether the packet is any kind of PTP event message.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index 53ac2fb78ab6da23794d14bb41eb8e05a01e1861..e9b785e0cc94c7e6363f20cc1e02a5ffc34f852f 100644 (file)
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@ -134,10 +134,8 @@ static int pch_ptp_match(struct sk_buff *skb, u16 uid_hi, u32 uid_lo, u16 seqid)
        u16 *hi, *id;
        u32 lo;
 
-       if ((sk_run_filter(skb, ptp_filter) != PTP_CLASS_V2_IPV4) &&
-               (sk_run_filter(skb, ptp_filter) != PTP_CLASS_V1_IPV4)) {
+       if (sk_run_filter(skb, ptp_filter) == PTP_CLASS_NONE)
                return 0;
-       }
 
        offset = ETH_HLEN + IPV4_HLEN(data) + UDP_HLEN;