renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-03 11:13:56 +08:00
Code

drivers: net: intel: use secpath helpers in more places

Browse Source 
Use skb_sec_path and secpath_exists helpers where possible.
This reduces noise in followup patch that removes skb->sp pointer.

v2: no changes, preseve acks from v1.

Acked-by: Shannon Nelson <shannon.lee.nelson@gmail.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Westphal 2018-12-18 17:15:21 +01:00 committed by David S. Miller
parent 2294be0f11
commit 2fdb435bc0
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c
View File

@ -1065,11 +1065,13 @@ int ixgbe_ipsec_tx(struct ixgbe_ring *tx_ring,
struct ixgbe_adapter *adapter = netdev_priv(tx_ring->netdev); struct ixgbe_adapter *adapter = netdev_priv(tx_ring->netdev);
struct ixgbe_ipsec *ipsec = adapter->ipsec; struct ixgbe_ipsec *ipsec = adapter->ipsec;
struct xfrm_state *xs; struct xfrm_state *xs;
struct sec_path *sp;
struct tx_sa *tsa; struct tx_sa *tsa;
if (unlikely(!first->skb->sp->len)) { sp = skb_sec_path(first->skb);
if (unlikely(!sp->len)) {
netdev_err(tx_ring->netdev, "%s: no xfrm state len = %d\n", netdev_err(tx_ring->netdev, "%s: no xfrm state len = %d\n",
__func__, first->skb->sp->len); __func__, sp->len);
return 0; return 0;
} }

5
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
View File

@ -8695,7 +8695,8 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb,
#endif /* IXGBE_FCOE */ #endif /* IXGBE_FCOE */
#ifdef CONFIG_IXGBE_IPSEC #ifdef CONFIG_IXGBE_IPSEC
if (skb->sp && !ixgbe_ipsec_tx(tx_ring, first, &ipsec_tx)) if (secpath_exists(skb) &&
!ixgbe_ipsec_tx(tx_ring, first, &ipsec_tx))
goto out_drop; goto out_drop;
#endif #endif
tso = ixgbe_tso(tx_ring, first, &hdr_len, &ipsec_tx); tso = ixgbe_tso(tx_ring, first, &hdr_len, &ipsec_tx);
@ -10192,7 +10193,7 @@ ixgbe_features_check(struct sk_buff *skb, struct net_device *dev,
*/ */
if (skb->encapsulation && !(features & NETIF_F_TSO_MANGLEID)) { if (skb->encapsulation && !(features & NETIF_F_TSO_MANGLEID)) {
#ifdef CONFIG_IXGBE_IPSEC #ifdef CONFIG_IXGBE_IPSEC
if (!skb->sp) if (!secpath_exists(skb))
#endif #endif
features &= ~NETIF_F_TSO; features &= ~NETIF_F_TSO;
} }

6
drivers/net/ethernet/intel/ixgbevf/ipsec.c
View File

@ -450,12 +450,14 @@ int ixgbevf_ipsec_tx(struct ixgbevf_ring *tx_ring,
struct ixgbevf_adapter *adapter = netdev_priv(tx_ring->netdev); struct ixgbevf_adapter *adapter = netdev_priv(tx_ring->netdev);
struct ixgbevf_ipsec *ipsec = adapter->ipsec; struct ixgbevf_ipsec *ipsec = adapter->ipsec;
struct xfrm_state *xs; struct xfrm_state *xs;
struct sec_path *sp;
struct tx_sa *tsa; struct tx_sa *tsa;
u16 sa_idx; u16 sa_idx;
if (unlikely(!first->skb->sp->len)) { sp = skb_sec_path(first->skb);
if (unlikely(!sp->len)) {
netdev_err(tx_ring->netdev, "%s: no xfrm state len = %d\n", netdev_err(tx_ring->netdev, "%s: no xfrm state len = %d\n",
__func__, first->skb->sp->len); __func__, sp->len);
return 0; return 0;
} }

2
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
View File

@ -4157,7 +4157,7 @@ static int ixgbevf_xmit_frame_ring(struct sk_buff *skb,
first->protocol = vlan_get_protocol(skb); first->protocol = vlan_get_protocol(skb);
#ifdef CONFIG_IXGBEVF_IPSEC #ifdef CONFIG_IXGBEVF_IPSEC
if (skb->sp && !ixgbevf_ipsec_tx(tx_ring, first, &ipsec_tx)) if (secpath_exists(skb) && !ixgbevf_ipsec_tx(tx_ring, first, &ipsec_tx))
goto out_drop; goto out_drop;
#endif #endif
tso = ixgbevf_tso(tx_ring, first, &hdr_len, &ipsec_tx); tso = ixgbevf_tso(tx_ring, first, &hdr_len, &ipsec_tx);