.. | .. |
---|
77 | 77 | netdev_features_t features) |
---|
78 | 78 | { |
---|
79 | 79 | struct sk_buff *segs = ERR_PTR(-EINVAL); |
---|
| 80 | + u16 mac_offset = skb->mac_header; |
---|
80 | 81 | unsigned int nsh_len, mac_len; |
---|
81 | 82 | __be16 proto; |
---|
82 | | - int nhoff; |
---|
83 | 83 | |
---|
84 | 84 | skb_reset_network_header(skb); |
---|
85 | 85 | |
---|
86 | | - nhoff = skb->network_header - skb->mac_header; |
---|
87 | 86 | mac_len = skb->mac_len; |
---|
88 | 87 | |
---|
89 | 88 | if (unlikely(!pskb_may_pull(skb, NSH_BASE_HDR_LEN))) |
---|
.. | .. |
---|
108 | 107 | segs = skb_mac_gso_segment(skb, features); |
---|
109 | 108 | if (IS_ERR_OR_NULL(segs)) { |
---|
110 | 109 | skb_gso_error_unwind(skb, htons(ETH_P_NSH), nsh_len, |
---|
111 | | - skb->network_header - nhoff, |
---|
112 | | - mac_len); |
---|
| 110 | + mac_offset, mac_len); |
---|
113 | 111 | goto out; |
---|
114 | 112 | } |
---|
115 | 113 | |
---|
116 | 114 | for (skb = segs; skb; skb = skb->next) { |
---|
117 | 115 | skb->protocol = htons(ETH_P_NSH); |
---|
118 | 116 | __skb_push(skb, nsh_len); |
---|
119 | | - skb_set_mac_header(skb, -nhoff); |
---|
| 117 | + skb->mac_header = mac_offset; |
---|
120 | 118 | skb->network_header = skb->mac_header + mac_len; |
---|
121 | 119 | skb->mac_len = mac_len; |
---|
122 | 120 | } |
---|