summaryrefslogtreecommitdiff
path: root/patches/0066-remove-netdev_ieee802154_ptr/cfg802154.patch
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2017-02-07 08:07:39 +0100
committerJohannes Berg <johannes.berg@intel.com>2017-02-07 15:07:16 +0100
commit75239f276ec894c87b8fbc268bdfb0f9fd290445 (patch)
tree14a91c251f2b1986a709876d90d9a0828b8c3769 /patches/0066-remove-netdev_ieee802154_ptr/cfg802154.patch
parent6981c5a175652d79562795127ab4ff62c9ecfac0 (diff)
backports: get rid of patch directory structure
This directory structure was never really managed well, simply get rid of it. With the patch system that only applies patches when the modified file exists, and with a lot of spatches applying everywhere anyway, it's no longer really useful either. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/0066-remove-netdev_ieee802154_ptr/cfg802154.patch')
-rw-r--r--patches/0066-remove-netdev_ieee802154_ptr/cfg802154.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/patches/0066-remove-netdev_ieee802154_ptr/cfg802154.patch b/patches/0066-remove-netdev_ieee802154_ptr/cfg802154.patch
new file mode 100644
index 00000000..25bf812f
--- /dev/null
+++ b/patches/0066-remove-netdev_ieee802154_ptr/cfg802154.patch
@@ -0,0 +1,18 @@
+--- a/include/net/cfg802154.h
++++ b/include/net/cfg802154.h
+@@ -359,6 +359,7 @@ struct wpan_dev {
+
+ #define to_phy(_dev) container_of(_dev, struct wpan_phy, dev)
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
+ static inline int
+ wpan_dev_hard_header(struct sk_buff *skb, struct net_device *dev,
+ const struct ieee802154_addr *daddr,
+@@ -369,6 +370,7 @@ wpan_dev_hard_header(struct sk_buff *skb
+
+ return wpan_dev->header_ops->create(skb, dev, daddr, saddr, len);
+ }
++#endif /* >= 3.19 */
+
+ struct wpan_phy *
+ wpan_phy_new(const struct cfg802154_ops *ops, size_t priv_size);