diff mbox

[RFC,bluetooth-next,06/19] 6lowpan: move lowpan_802154_dev to 6lowpan

Message ID 1458652515-7862-7-git-send-email-aar@pengutronix.de (mailing list archive)
State Superseded
Headers show

Commit Message

Alexander Aring March 22, 2016, 1:15 p.m. UTC
This patch moves the 802.15.4 link layer specific structures to generic
6lowpan. This is necessary for special 802.15.4 6lowpan handling in
upper layers.

Signed-off-by: Alexander Aring <aar@pengutronix.de>
---
 include/net/6lowpan.h              | 12 ++++++++++++
 net/ieee802154/6lowpan/6lowpan_i.h | 12 ------------
 2 files changed, 12 insertions(+), 12 deletions(-)

Comments

Stefan Schmidt March 23, 2016, 10:08 a.m. UTC | #1
Hello.

On 22/03/16 14:15, Alexander Aring wrote:
> This patch moves the 802.15.4 link layer specific structures to generic
> 6lowpan. This is necessary for special 802.15.4 6lowpan handling in
> upper layers.
>
> Signed-off-by: Alexander Aring <aar@pengutronix.de>
> ---
>   include/net/6lowpan.h              | 12 ++++++++++++
>   net/ieee802154/6lowpan/6lowpan_i.h | 12 ------------
>   2 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/include/net/6lowpan.h b/include/net/6lowpan.h
> index f204664..a0c01f5 100644
> --- a/include/net/6lowpan.h
> +++ b/include/net/6lowpan.h
> @@ -144,6 +144,18 @@ struct lowpan_dev *lowpan_dev(const struct net_device *dev)
>   	return netdev_priv(dev);
>   }
>   
> +/* private device info */
> +struct lowpan_802154_dev {
> +	struct net_device	*wdev; /* wpan device ptr */
> +	u16			fragment_tag;
> +};
> +
> +static inline struct
> +lowpan_802154_dev *lowpan_802154_dev(const struct net_device *dev)
> +{
> +	return (struct lowpan_802154_dev *)lowpan_dev(dev)->priv;
> +}
> +
>   struct lowpan_802154_cb {
>   	u16 d_tag;
>   	unsigned int d_size;
> diff --git a/net/ieee802154/6lowpan/6lowpan_i.h b/net/ieee802154/6lowpan/6lowpan_i.h
> index b02b74d..5ac7789 100644
> --- a/net/ieee802154/6lowpan/6lowpan_i.h
> +++ b/net/ieee802154/6lowpan/6lowpan_i.h
> @@ -47,18 +47,6 @@ static inline u32 ieee802154_addr_hash(const struct ieee802154_addr *a)
>   	}
>   }
>   
> -/* private device info */
> -struct lowpan_802154_dev {
> -	struct net_device	*wdev; /* wpan device ptr */
> -	u16			fragment_tag;
> -};
> -
> -static inline struct
> -lowpan_802154_dev *lowpan_802154_dev(const struct net_device *dev)
> -{
> -	return (struct lowpan_802154_dev *)lowpan_dev(dev)->priv;
> -}
> -
>   int lowpan_frag_rcv(struct sk_buff *skb, const u8 frag_type);
>   void lowpan_net_frag_exit(void);
>   int lowpan_net_frag_init(void);

Reviewed-by: Stefan Schmidt <stefan@osg.samsung.com>

regards
Stefan Schmidt
--
To unsubscribe from this list: send the line "unsubscribe linux-wpan" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/include/net/6lowpan.h b/include/net/6lowpan.h
index f204664..a0c01f5 100644
--- a/include/net/6lowpan.h
+++ b/include/net/6lowpan.h
@@ -144,6 +144,18 @@  struct lowpan_dev *lowpan_dev(const struct net_device *dev)
 	return netdev_priv(dev);
 }
 
+/* private device info */
+struct lowpan_802154_dev {
+	struct net_device	*wdev; /* wpan device ptr */
+	u16			fragment_tag;
+};
+
+static inline struct
+lowpan_802154_dev *lowpan_802154_dev(const struct net_device *dev)
+{
+	return (struct lowpan_802154_dev *)lowpan_dev(dev)->priv;
+}
+
 struct lowpan_802154_cb {
 	u16 d_tag;
 	unsigned int d_size;
diff --git a/net/ieee802154/6lowpan/6lowpan_i.h b/net/ieee802154/6lowpan/6lowpan_i.h
index b02b74d..5ac7789 100644
--- a/net/ieee802154/6lowpan/6lowpan_i.h
+++ b/net/ieee802154/6lowpan/6lowpan_i.h
@@ -47,18 +47,6 @@  static inline u32 ieee802154_addr_hash(const struct ieee802154_addr *a)
 	}
 }
 
-/* private device info */
-struct lowpan_802154_dev {
-	struct net_device	*wdev; /* wpan device ptr */
-	u16			fragment_tag;
-};
-
-static inline struct
-lowpan_802154_dev *lowpan_802154_dev(const struct net_device *dev)
-{
-	return (struct lowpan_802154_dev *)lowpan_dev(dev)->priv;
-}
-
 int lowpan_frag_rcv(struct sk_buff *skb, const u8 frag_type);
 void lowpan_net_frag_exit(void);
 int lowpan_net_frag_init(void);