2014-07-30 05:35:10

by Varka Bhadram

[permalink] [raw]
Subject: [PATCH bluetooth-next 0/2] 6lowpan cleanup

From: Varka Bhadram <[email protected]>

This series removes the unused macros and function for 6lowpan

Varka Bhadram (2):
6lowpan: remove unused macros
6lowpan: remove unused function

include/net/6lowpan.h | 26 --------------------------
1 file changed, 26 deletions(-)

--
1.7.9.5



2014-07-30 05:55:03

by Marcel Holtmann

[permalink] [raw]
Subject: Re: [PATCH bluetooth-next 0/2] 6lowpan cleanup

Hi Varka,

> This series removes the unused macros and function for 6lowpan
>
> Varka Bhadram (2):
> 6lowpan: remove unused macros
> 6lowpan: remove unused function
>
> include/net/6lowpan.h | 26 --------------------------
> 1 file changed, 26 deletions(-)

both patches have been applied to bluetooth-next tree.

Regards

Marcel


2014-07-30 05:51:47

by Alexander Aring

[permalink] [raw]
Subject: Re: [PATCH bluetooth-next 0/2] 6lowpan cleanup

Hi Varka,


On Wed, Jul 30, 2014 at 11:05:10AM +0530, [email protected] wrote:
> From: Varka Bhadram <[email protected]>
>
> This series removes the unused macros and function for 6lowpan
>

Acked-by: Alexander Aring <[email protected]>

2014-07-30 05:35:12

by Varka Bhadram

[permalink] [raw]
Subject: [PATCH bluetooth-next 2/2] 6lowpan: remove unused function

From: Varka Bhadram <[email protected]>

This patch removes the unused function.

Signed-off-by: Varka Bhadram <[email protected]>
---
include/net/6lowpan.h | 11 -----------
1 file changed, 11 deletions(-)

diff --git a/include/net/6lowpan.h b/include/net/6lowpan.h
index 614920a..d184df1 100644
--- a/include/net/6lowpan.h
+++ b/include/net/6lowpan.h
@@ -240,17 +240,6 @@ static inline int lowpan_fetch_skb_u8(struct sk_buff *skb, u8 *val)
return 0;
}

-static inline int lowpan_fetch_skb_u16(struct sk_buff *skb, u16 *val)
-{
- if (unlikely(!pskb_may_pull(skb, 2)))
- return -EINVAL;
-
- *val = (skb->data[0] << 8) | skb->data[1];
- skb_pull(skb, 2);
-
- return 0;
-}
-
static inline bool lowpan_fetch_skb(struct sk_buff *skb,
void *data, const unsigned int len)
{
--
1.7.9.5


2014-07-30 05:35:11

by Varka Bhadram

[permalink] [raw]
Subject: [PATCH bluetooth-next 1/2] 6lowpan: remove unused macros

From: Varka Bhadram <[email protected]>

This patch removes the unused macros.

Signed-off-by: Varka Bhadram <[email protected]>
---
include/net/6lowpan.h | 15 ---------------
1 file changed, 15 deletions(-)

diff --git a/include/net/6lowpan.h b/include/net/6lowpan.h
index 3bb3503..614920a 100644
--- a/include/net/6lowpan.h
+++ b/include/net/6lowpan.h
@@ -75,10 +75,6 @@
(((a)->s6_addr[14]) == (m)[6]) && \
(((a)->s6_addr[15]) == (m)[7]))

-/* compare ipv6 addresses prefixes */
-#define ipaddr_prefixcmp(addr1, addr2, length) \
- (memcmp(addr1, addr2, length >> 3) == 0)
-
/*
* check whether we can compress the IID to 16 bits,
* it's possible for unicast adresses with first 49 bits are zero only.
@@ -92,17 +88,6 @@

/* check whether the 112-bit gid of the multicast address is mappable to: */

-/* 9 bits, for FF02::1 (all nodes) and FF02::2 (all routers) addresses only. */
-#define lowpan_is_mcast_addr_compressable(a) \
- ((((a)->s6_addr16[1]) == 0) && \
- (((a)->s6_addr16[2]) == 0) && \
- (((a)->s6_addr16[3]) == 0) && \
- (((a)->s6_addr16[4]) == 0) && \
- (((a)->s6_addr16[5]) == 0) && \
- (((a)->s6_addr16[6]) == 0) && \
- (((a)->s6_addr[14]) == 0) && \
- ((((a)->s6_addr[15]) == 1) || (((a)->s6_addr[15]) == 2)))
-
/* 48 bits, FFXX::00XX:XXXX:XXXX */
#define lowpan_is_mcast_addr_compressable48(a) \
((((a)->s6_addr16[1]) == 0) && \
--
1.7.9.5