summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Aring <aar@pengutronix.de>2016-04-11 11:04:19 +0200
committerMarcel Holtmann <marcel@holtmann.org>2016-04-13 10:41:09 +0200
commit353c224e28eb73e65720e5b2be224052569c0764 (patch)
tree1a558aabcd2e7d2982bf5c1856b85e75fbdcd07b
parent2e4d60cbcfc2d16a2a2efaae3fe08f2e457d59a1 (diff)
downloadlinux-353c224e28eb73e65720e5b2be224052569c0764.tar.gz
linux-353c224e28eb73e65720e5b2be224052569c0764.tar.bz2
linux-353c224e28eb73e65720e5b2be224052569c0764.zip
6lowpan: move lowpan_802154_dev to 6lowpan
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 6lowpan generic layer. 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>
-rw-r--r--include/net/6lowpan.h12
-rw-r--r--net/ieee802154/6lowpan/6lowpan_i.h12
2 files changed, 12 insertions, 12 deletions
diff --git a/include/net/6lowpan.h b/include/net/6lowpan.h
index f204664f37ab..a0c01f55e0d3 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 b02b74de8ffa..5ac778962e4e 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);