|
@@ -2957,7 +2957,7 @@ static bool bond_flow_dissect(struct bonding *bond, struct sk_buff *skb,
|
|
fk->ports = 0;
|
|
fk->ports = 0;
|
|
noff = skb_network_offset(skb);
|
|
noff = skb_network_offset(skb);
|
|
if (skb->protocol == htons(ETH_P_IP)) {
|
|
if (skb->protocol == htons(ETH_P_IP)) {
|
|
- if (!pskb_may_pull(skb, noff + sizeof(*iph)))
|
|
|
|
|
|
+ if (unlikely(!pskb_may_pull(skb, noff + sizeof(*iph))))
|
|
return false;
|
|
return false;
|
|
iph = ip_hdr(skb);
|
|
iph = ip_hdr(skb);
|
|
fk->src = iph->saddr;
|
|
fk->src = iph->saddr;
|
|
@@ -2966,7 +2966,7 @@ static bool bond_flow_dissect(struct bonding *bond, struct sk_buff *skb,
|
|
if (!ip_is_fragment(iph))
|
|
if (!ip_is_fragment(iph))
|
|
proto = iph->protocol;
|
|
proto = iph->protocol;
|
|
} else if (skb->protocol == htons(ETH_P_IPV6)) {
|
|
} else if (skb->protocol == htons(ETH_P_IPV6)) {
|
|
- if (!pskb_may_pull(skb, noff + sizeof(*iph6)))
|
|
|
|
|
|
+ if (unlikely(!pskb_may_pull(skb, noff + sizeof(*iph6))))
|
|
return false;
|
|
return false;
|
|
iph6 = ipv6_hdr(skb);
|
|
iph6 = ipv6_hdr(skb);
|
|
fk->src = (__force __be32)ipv6_addr_hash(&iph6->saddr);
|
|
fk->src = (__force __be32)ipv6_addr_hash(&iph6->saddr);
|
|
@@ -3768,7 +3768,7 @@ static netdev_tx_t bond_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|
* If we risk deadlock from transmitting this in the
|
|
* If we risk deadlock from transmitting this in the
|
|
* netpoll path, tell netpoll to queue the frame for later tx
|
|
* netpoll path, tell netpoll to queue the frame for later tx
|
|
*/
|
|
*/
|
|
- if (is_netpoll_tx_blocked(dev))
|
|
|
|
|
|
+ if (unlikely(is_netpoll_tx_blocked(dev)))
|
|
return NETDEV_TX_BUSY;
|
|
return NETDEV_TX_BUSY;
|
|
|
|
|
|
rcu_read_lock();
|
|
rcu_read_lock();
|