diff options
| author | Daniel Borkmann | 2017-07-02 02:13:25 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-07-03 11:22:51 +0200 |
| commit | 0daf4349406074fc03e4889ba5e97e6fb5311bab (patch) | |
| tree | 9e0dae4b6a5c254804136df0ee6827c3ba0f3b26 /net/core | |
| parent | net: cdc_mbim: apply "NDP to end" quirk to HP lt4132 (diff) | |
| download | kernel-qcow2-linux-0daf4349406074fc03e4889ba5e97e6fb5311bab.tar.gz kernel-qcow2-linux-0daf4349406074fc03e4889ba5e97e6fb5311bab.tar.xz kernel-qcow2-linux-0daf4349406074fc03e4889ba5e97e6fb5311bab.zip | |
bpf, net: add skb_mac_header_len helper
Add a small skb_mac_header_len() helper similarly as the
skb_network_header_len() we have and replace open coded
places in BPF's bpf_skb_change_proto() helper. Will also
be used in upcoming work.
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/filter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/filter.c b/net/core/filter.c index e5c280aa5de6..68d8cd865c4a 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -2012,7 +2012,7 @@ static int bpf_skb_net_hdr_pop(struct sk_buff *skb, u32 off, u32 len) static int bpf_skb_proto_4_to_6(struct sk_buff *skb) { const u32 len_diff = sizeof(struct ipv6hdr) - sizeof(struct iphdr); - u32 off = skb->network_header - skb->mac_header; + u32 off = skb_mac_header_len(skb); int ret; ret = skb_cow(skb, len_diff); @@ -2048,7 +2048,7 @@ static int bpf_skb_proto_4_to_6(struct sk_buff *skb) static int bpf_skb_proto_6_to_4(struct sk_buff *skb) { const u32 len_diff = sizeof(struct ipv6hdr) - sizeof(struct iphdr); - u32 off = skb->network_header - skb->mac_header; + u32 off = skb_mac_header_len(skb); int ret; ret = skb_unclone(skb, GFP_ATOMIC); |