diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2012-04-05 05:35:15 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-05 05:36:43 -0400 |
commit | 51c56b004e2c9a46207bb8a116589c2f84b92e5d (patch) | |
tree | a11714f3749262d1ab084960ab441ff0a1379331 /net/appletalk | |
parent | 109d2446052a484c58f07f71f9457bf7b71017f8 (diff) |
net: remove k{un}map_skb_frag()
Since commit 3e4d3af501 (mm: stack based kmap_atomic()) we dont have
to disable BH anymore while mapping skb frags.
We can remove kmap_skb_frag() / kunmap_skb_frag() helpers and use
kmap_atomic() / kunmap_atomic()
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/appletalk')
-rw-r--r-- | net/appletalk/ddp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c index bfa9ab93eda5..0301b328cf0f 100644 --- a/net/appletalk/ddp.c +++ b/net/appletalk/ddp.c | |||
@@ -63,7 +63,7 @@ | |||
63 | #include <net/tcp_states.h> | 63 | #include <net/tcp_states.h> |
64 | #include <net/route.h> | 64 | #include <net/route.h> |
65 | #include <linux/atalk.h> | 65 | #include <linux/atalk.h> |
66 | #include "../core/kmap_skb.h" | 66 | #include <linux/highmem.h> |
67 | 67 | ||
68 | struct datalink_proto *ddp_dl, *aarp_dl; | 68 | struct datalink_proto *ddp_dl, *aarp_dl; |
69 | static const struct proto_ops atalk_dgram_ops; | 69 | static const struct proto_ops atalk_dgram_ops; |
@@ -960,10 +960,10 @@ static unsigned long atalk_sum_skb(const struct sk_buff *skb, int offset, | |||
960 | 960 | ||
961 | if (copy > len) | 961 | if (copy > len) |
962 | copy = len; | 962 | copy = len; |
963 | vaddr = kmap_skb_frag(frag); | 963 | vaddr = kmap_atomic(skb_frag_page(frag)); |
964 | sum = atalk_sum_partial(vaddr + frag->page_offset + | 964 | sum = atalk_sum_partial(vaddr + frag->page_offset + |
965 | offset - start, copy, sum); | 965 | offset - start, copy, sum); |
966 | kunmap_skb_frag(vaddr); | 966 | kunmap_atomic(vaddr); |
967 | 967 | ||
968 | if (!(len -= copy)) | 968 | if (!(len -= copy)) |
969 | return sum; | 969 | return sum; |