hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/net/nsh/nsh.c
....@@ -77,13 +77,12 @@
7777 netdev_features_t features)
7878 {
7979 struct sk_buff *segs = ERR_PTR(-EINVAL);
80
+ u16 mac_offset = skb->mac_header;
8081 unsigned int nsh_len, mac_len;
8182 __be16 proto;
82
- int nhoff;
8383
8484 skb_reset_network_header(skb);
8585
86
- nhoff = skb->network_header - skb->mac_header;
8786 mac_len = skb->mac_len;
8887
8988 if (unlikely(!pskb_may_pull(skb, NSH_BASE_HDR_LEN)))
....@@ -108,15 +107,14 @@
108107 segs = skb_mac_gso_segment(skb, features);
109108 if (IS_ERR_OR_NULL(segs)) {
110109 skb_gso_error_unwind(skb, htons(ETH_P_NSH), nsh_len,
111
- skb->network_header - nhoff,
112
- mac_len);
110
+ mac_offset, mac_len);
113111 goto out;
114112 }
115113
116114 for (skb = segs; skb; skb = skb->next) {
117115 skb->protocol = htons(ETH_P_NSH);
118116 __skb_push(skb, nsh_len);
119
- skb_set_mac_header(skb, -nhoff);
117
+ skb->mac_header = mac_offset;
120118 skb->network_header = skb->mac_header + mac_len;
121119 skb->mac_len = mac_len;
122120 }