History

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec

Steffen Klassert says: ==================== pull request (net): ipsec 2022-03-09 1) Fix IPv6 PMTU discovery for xfrm interfaces. From Lina Wang. 2) Revert failing for policies and states that are configured with XFRMA_IF_ID 0. It broke a user configuration. From Kai Lueke. 3) Fix a possible buffer overflow in the ESP output path. 4) Fix ESP GSO for tunnel and BEET mode on inter address family tunnels. ====================

David S. Miller committed 4 years ago

Commit cc7e2f52 parents 71171ac 23c7f8d10 files · +70 −23Browse files

Showing the changes to include (2 of 10 files). Show all

Unified · Split

2 files
  1. include/linux/netdevice.h +2 −0
  2. include/net/esp.h +2 −0
include/linux/netdevice.h+2−0
@@ -4602,6 +4602,8 @@ int skb_csum_hwoffload_help(struct sk_buff *skb, · 4601 unmodified lines
46024602
46034603 struct sk_buff *__skb_gso_segment(struct sk_buff *skb,
46044604 netdev_features_t features, bool tx_path);
4605+struct sk_buff *skb_eth_gso_segment(struct sk_buff *skb,
4606+ netdev_features_t features, __be16 type);
46054607 struct sk_buff *skb_mac_gso_segment(struct sk_buff *skb,
46064608 netdev_features_t features);
46074609
include/net/esp.h+2−0
@@ -4,6 +4,8 @@ · 3 unmodified lines
44
55 #include <linux/skbuff.h>
66
7+#define ESP_SKB_FRAG_MAXSIZE (PAGE_SIZE << SKB_FRAG_PAGE_ORDER)
8+
79 struct ip_esp_hdr;
810
911 static inline struct ip_esp_hdr *ip_esp_hdr(const struct sk_buff *skb)