diff options
| author | James Morris <[email protected]> | 2018-04-24 03:57:26 +1000 |
|---|---|---|
| committer | James Morris <[email protected]> | 2018-04-24 03:57:26 +1000 |
| commit | b393a707c84bb56a7800c93849fd8b492f76ba42 (patch) | |
| tree | 0c752bbf4d28f47d29042df8fa0c7826c51c50fd /include/linux/netdev_features.h | |
| parent | e59644b720aed4b9ec9d3818b483f97376fb31ed (diff) | |
| parent | 6d08b06e67cd117f6992c46611dfb4ce267cd71e (diff) | |
Merge tag 'v4.17-rc2' into next-general
Sync to Linux 4.17-rc2 for developers.
Diffstat (limited to 'include/linux/netdev_features.h')
| -rw-r--r-- | include/linux/netdev_features.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h index db84c516bcfb..35b79f47a13d 100644 --- a/include/linux/netdev_features.h +++ b/include/linux/netdev_features.h @@ -79,6 +79,7 @@ enum { NETIF_F_RX_UDP_TUNNEL_PORT_BIT, /* Offload of RX port for UDP tunnels */ NETIF_F_GRO_HW_BIT, /* Hardware Generic receive offload */ + NETIF_F_HW_TLS_RECORD_BIT, /* Offload TLS record */ /* * Add your fresh new feature above and remember to update @@ -145,6 +146,7 @@ enum { #define NETIF_F_HW_ESP __NETIF_F(HW_ESP) #define NETIF_F_HW_ESP_TX_CSUM __NETIF_F(HW_ESP_TX_CSUM) #define NETIF_F_RX_UDP_TUNNEL_PORT __NETIF_F(RX_UDP_TUNNEL_PORT) +#define NETIF_F_HW_TLS_RECORD __NETIF_F(HW_TLS_RECORD) #define for_each_netdev_feature(mask_addr, bit) \ for_each_set_bit(bit, (unsigned long *)mask_addr, NETDEV_FEATURE_COUNT) |