Commit b9c701ed authored by Stefan Sørensen's avatar Stefan Sørensen Committed by David S. Miller

net: Simplify ptp class checks

Replace two switch statements enumerating all valid ptp classes with an if
statement matching for not PTP_CLASS_NONE.
Signed-off-by: default avatarStefan Sørensen <stefan.sorensen@spectralink.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 239960d6
...@@ -43,31 +43,22 @@ void skb_clone_tx_timestamp(struct sk_buff *skb) ...@@ -43,31 +43,22 @@ void skb_clone_tx_timestamp(struct sk_buff *skb)
return; return;
type = classify(skb); type = classify(skb);
if (type == PTP_CLASS_NONE)
return;
phydev = skb->dev->phydev;
if (likely(phydev->drv->txtstamp)) {
if (!atomic_inc_not_zero(&sk->sk_refcnt))
return;
switch (type) { clone = skb_clone(skb, GFP_ATOMIC);
case PTP_CLASS_V1_IPV4: if (!clone) {
case PTP_CLASS_V1_IPV6: sock_put(sk);
case PTP_CLASS_V2_IPV4: return;
case PTP_CLASS_V2_IPV6:
case PTP_CLASS_V2_L2:
case PTP_CLASS_V2_VLAN:
phydev = skb->dev->phydev;
if (likely(phydev->drv->txtstamp)) {
if (!atomic_inc_not_zero(&sk->sk_refcnt))
return;
clone = skb_clone(skb, GFP_ATOMIC);
if (!clone) {
sock_put(sk);
return;
}
clone->sk = sk;
phydev->drv->txtstamp(phydev, clone, type);
} }
break;
default: clone->sk = sk;
break; phydev->drv->txtstamp(phydev, clone, type);
} }
} }
EXPORT_SYMBOL_GPL(skb_clone_tx_timestamp); EXPORT_SYMBOL_GPL(skb_clone_tx_timestamp);
...@@ -114,20 +105,12 @@ bool skb_defer_rx_timestamp(struct sk_buff *skb) ...@@ -114,20 +105,12 @@ bool skb_defer_rx_timestamp(struct sk_buff *skb)
__skb_pull(skb, ETH_HLEN); __skb_pull(skb, ETH_HLEN);
switch (type) { if (type == PTP_CLASS_NONE)
case PTP_CLASS_V1_IPV4: return false;
case PTP_CLASS_V1_IPV6:
case PTP_CLASS_V2_IPV4: phydev = skb->dev->phydev;
case PTP_CLASS_V2_IPV6: if (likely(phydev->drv->rxtstamp))
case PTP_CLASS_V2_L2: return phydev->drv->rxtstamp(phydev, skb, type);
case PTP_CLASS_V2_VLAN:
phydev = skb->dev->phydev;
if (likely(phydev->drv->rxtstamp))
return phydev->drv->rxtstamp(phydev, skb, type);
break;
default:
break;
}
return false; return false;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment