diff options
| author | Vlad Yasevich <vyasevic@redhat.com> | 2012-11-15 08:49:20 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-15 17:39:23 -0500 |
| commit | 3c73a0368e995f047c14388a05dcfba599053bef (patch) | |
| tree | 1c5d8d505ec43c325ebc200ddd124f9c131e6558 /net/ipv6/exthdrs.c | |
| parent | 2207afc8bfd80d596b524d4feb6b27f5ce359d59 (diff) | |
ipv6: Update ipv6 static library with newly needed functions
UDP offload needs some additional functions to be in the static kernel
for it work correclty. Move those functions into the core.
Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/exthdrs.c')
| -rw-r--r-- | net/ipv6/exthdrs.c | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c index 70fbf6bc5a87..a786a20ad823 100644 --- a/net/ipv6/exthdrs.c +++ b/net/ipv6/exthdrs.c @@ -50,50 +50,6 @@ #include <asm/uaccess.h> #include "ip6_offload.h" -int ipv6_find_tlv(struct sk_buff *skb, int offset, int type) -{ - const unsigned char *nh = skb_network_header(skb); - int packet_len = skb->tail - skb->network_header; - struct ipv6_opt_hdr *hdr; - int len; - - if (offset + 2 > packet_len) - goto bad; - hdr = (struct ipv6_opt_hdr *)(nh + offset); - len = ((hdr->hdrlen + 1) << 3); - - if (offset + len > packet_len) - goto bad; - - offset += 2; - len -= 2; - - while (len > 0) { - int opttype = nh[offset]; - int optlen; - - if (opttype == type) - return offset; - - switch (opttype) { - case IPV6_TLV_PAD1: - optlen = 1; - break; - default: - optlen = nh[offset + 1] + 2; - if (optlen > len) - goto bad; - break; - } - offset += optlen; - len -= optlen; - } - /* not_found */ - bad: - return -1; -} -EXPORT_SYMBOL_GPL(ipv6_find_tlv); - /* * Parsing tlv encoded headers. * |