diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-11-11 16:30:48 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-11-11 16:30:48 -0500 |
| commit | 6164c202289f4718acf00c0dbe5f130b07330ab2 (patch) | |
| tree | 8c0e1f685b811030080344eba161314939e49f78 /include/linux/netdevice.h | |
| parent | bf515fb11ab539c76d04f0e3c5216ed41f41d81f (diff) | |
| parent | 56b2c3eea398c772dd895dc62c18cbdd1ba127b1 (diff) | |
| download | linux-6164c202289f4718acf00c0dbe5f130b07330ab2.tar.gz linux-6164c202289f4718acf00c0dbe5f130b07330ab2.tar.bz2 linux-6164c202289f4718acf00c0dbe5f130b07330ab2.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 74fd5d37f15a..c9bcf33efb47 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -57,6 +57,8 @@ struct device; struct phy_device; /* 802.11 specific */ struct wireless_dev; +/* 802.15.4 specific */ +struct wpan_dev; void netdev_set_default_ethtool_ops(struct net_device *dev, const struct ethtool_ops *ops); @@ -1572,6 +1574,7 @@ struct net_device { struct inet6_dev __rcu *ip6_ptr; void *ax25_ptr; struct wireless_dev *ieee80211_ptr; + struct wpan_dev *ieee802154_ptr; /* * Cache lines mostly used on receive path (including eth_type_trans()) |