mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 22:26:55 +00:00
Code Issues Releases Wiki Activity

6lowpan: iphc: rename add lowpan prefix

Browse source 
This patch adds a lowpan prefix to each functions which doesn't have
such prefix currently.

Reviewed-by: Stefan Schmidt <stefan@osg.samsung.com>
Signed-off-by: Alexander Aring <aar@pengutronix.de>
Acked-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Alexander Aring 2016-04-11 11:04:20 +02:00 committed by Marcel Holtmann
parent 353c224e28
commit 7115a968b7
1 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
net/6lowpan/iphc.c
View file

@ -156,8 +156,8 @@
#define LOWPAN_IPHC_CID_DCI(cid) (cid & 0x0f) #define LOWPAN_IPHC_CID_DCI(cid) (cid & 0x0f)
#define LOWPAN_IPHC_CID_SCI(cid) ((cid & 0xf0) >> 4) #define LOWPAN_IPHC_CID_SCI(cid) ((cid & 0xf0) >> 4)
static inline void iphc_uncompress_eui64_lladdr(struct in6_addr *ipaddr, static inline void lowpan_iphc_uncompress_eui64_lladdr(struct in6_addr *ipaddr,
const void *lladdr) const void *lladdr)
{ {
/* fe:80::XXXX:XXXX:XXXX:XXXX /* fe:80::XXXX:XXXX:XXXX:XXXX
* \_________________/ * \_________________/
@ -172,8 +172,9 @@ static inline void iphc_uncompress_eui64_lladdr(struct in6_addr *ipaddr,
ipaddr->s6_addr[8] ^= 0x02; ipaddr->s6_addr[8] ^= 0x02;
} }
static inline void iphc_uncompress_802154_lladdr(struct in6_addr *ipaddr, static inline void
const void *lladdr) lowpan_iphc_uncompress_802154_lladdr(struct in6_addr *ipaddr,
const void *lladdr)
{ {
const struct ieee802154_addr *addr = lladdr; const struct ieee802154_addr *addr = lladdr;
u8 eui64[EUI64_ADDR_LEN] = { }; u8 eui64[EUI64_ADDR_LEN] = { };
@ -181,7 +182,7 @@ static inline void iphc_uncompress_802154_lladdr(struct in6_addr *ipaddr,
switch (addr->mode) { switch (addr->mode) {
case IEEE802154_ADDR_LONG: case IEEE802154_ADDR_LONG:
ieee802154_le64_to_be64(eui64, &addr->extended_addr); ieee802154_le64_to_be64(eui64, &addr->extended_addr);
iphc_uncompress_eui64_lladdr(ipaddr, eui64); lowpan_iphc_uncompress_eui64_lladdr(ipaddr, eui64);
break; break;
case IEEE802154_ADDR_SHORT: case IEEE802154_ADDR_SHORT:
/* fe:80::ff:fe00:XXXX /* fe:80::ff:fe00:XXXX
@ -301,9 +302,10 @@ lowpan_iphc_ctx_get_by_mcast_addr(const struct net_device *dev,
* *
* address_mode is the masked value for sam or dam value * address_mode is the masked value for sam or dam value
*/ */
static int uncompress_addr(struct sk_buff *skb, const struct net_device *dev, static int lowpan_iphc_uncompress_addr(struct sk_buff *skb,
struct in6_addr *ipaddr, u8 address_mode, const struct net_device *dev,
const void *lladdr) struct in6_addr *ipaddr,
u8 address_mode, const void *lladdr)
{ {
bool fail; bool fail;
@ -334,10 +336,10 @@ static int uncompress_addr(struct sk_buff *skb, const struct net_device *dev,
fail = false; fail = false;
switch (lowpan_dev(dev)->lltype) { switch (lowpan_dev(dev)->lltype) {
case LOWPAN_LLTYPE_IEEE802154: case LOWPAN_LLTYPE_IEEE802154:
iphc_uncompress_802154_lladdr(ipaddr, lladdr); lowpan_iphc_uncompress_802154_lladdr(ipaddr, lladdr);
break; break;
default: default:
iphc_uncompress_eui64_lladdr(ipaddr, lladdr); lowpan_iphc_uncompress_eui64_lladdr(ipaddr, lladdr);
break; break;
} }
break; break;
@ -360,11 +362,11 @@ static int uncompress_addr(struct sk_buff *skb, const struct net_device *dev,
/* Uncompress address function for source context /* Uncompress address function for source context
* based address(non-multicast). * based address(non-multicast).
*/ */
static int uncompress_ctx_addr(struct sk_buff *skb, static int lowpan_iphc_uncompress_ctx_addr(struct sk_buff *skb,
const struct net_device *dev, const struct net_device *dev,
const struct lowpan_iphc_ctx *ctx, const struct lowpan_iphc_ctx *ctx,
struct in6_addr *ipaddr, u8 address_mode, struct in6_addr *ipaddr,
const void *lladdr) u8 address_mode, const void *lladdr)
{ {
bool fail; bool fail;
@ -395,10 +397,10 @@ static int uncompress_ctx_addr(struct sk_buff *skb,
fail = false; fail = false;
switch (lowpan_dev(dev)->lltype) { switch (lowpan_dev(dev)->lltype) {
case LOWPAN_LLTYPE_IEEE802154: case LOWPAN_LLTYPE_IEEE802154:
iphc_uncompress_802154_lladdr(ipaddr, lladdr); lowpan_iphc_uncompress_802154_lladdr(ipaddr, lladdr);
break; break;
default: default:
iphc_uncompress_eui64_lladdr(ipaddr, lladdr); lowpan_iphc_uncompress_eui64_lladdr(ipaddr, lladdr);
break; break;
} }
ipv6_addr_prefix_copy(ipaddr, &ctx->pfx, ctx->plen); ipv6_addr_prefix_copy(ipaddr, &ctx->pfx, ctx->plen);
@ -665,14 +667,16 @@ int lowpan_header_decompress(struct sk_buff *skb, const struct net_device *dev,
} }
pr_debug("SAC bit is set. Handle context based source address.\n"); pr_debug("SAC bit is set. Handle context based source address.\n");
err = uncompress_ctx_addr(skb, dev, ci, &hdr.saddr, err = lowpan_iphc_uncompress_ctx_addr(skb, dev, ci, &hdr.saddr,
iphc1 & LOWPAN_IPHC_SAM_MASK, saddr); iphc1 & LOWPAN_IPHC_SAM_MASK,
saddr);
spin_unlock_bh(&lowpan_dev(dev)->ctx.lock); spin_unlock_bh(&lowpan_dev(dev)->ctx.lock);
} else { } else {
/* Source address uncompression */ /* Source address uncompression */
pr_debug("source address stateless compression\n"); pr_debug("source address stateless compression\n");
err = uncompress_addr(skb, dev, &hdr.saddr, err = lowpan_iphc_uncompress_addr(skb, dev, &hdr.saddr,
iphc1 & LOWPAN_IPHC_SAM_MASK, saddr); iphc1 & LOWPAN_IPHC_SAM_MASK,
saddr);
} }
/* Check on error of previous branch */ /* Check on error of previous branch */
@ -710,13 +714,15 @@ int lowpan_header_decompress(struct sk_buff *skb, const struct net_device *dev,
/* Destination address context based uncompression */ /* Destination address context based uncompression */
pr_debug("DAC bit is set. Handle context based destination address.\n"); pr_debug("DAC bit is set. Handle context based destination address.\n");
err = uncompress_ctx_addr(skb, dev, ci, &hdr.daddr, err = lowpan_iphc_uncompress_ctx_addr(skb, dev, ci, &hdr.daddr,
iphc1 & LOWPAN_IPHC_DAM_MASK, daddr); iphc1 & LOWPAN_IPHC_DAM_MASK,
daddr);
spin_unlock_bh(&lowpan_dev(dev)->ctx.lock); spin_unlock_bh(&lowpan_dev(dev)->ctx.lock);
break; break;
default: default:
err = uncompress_addr(skb, dev, &hdr.daddr, err = lowpan_iphc_uncompress_addr(skb, dev, &hdr.daddr,
iphc1 & LOWPAN_IPHC_DAM_MASK, daddr); iphc1 & LOWPAN_IPHC_DAM_MASK,
daddr);
pr_debug("dest: stateless compression mode %d dest %pI6c\n", pr_debug("dest: stateless compression mode %d dest %pI6c\n",
iphc1 & LOWPAN_IPHC_DAM_MASK, &hdr.daddr); iphc1 & LOWPAN_IPHC_DAM_MASK, &hdr.daddr);
break; break;