diff options
| author | David S. Miller <davem@davemloft.net> | 2018-07-12 10:19:06 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-12 10:19:06 +0300 |
| commit | 672f5ccece3ba3fc851d9c73924ae16f39e4c176 (patch) | |
| tree | eafe6c648865814bc8c53aa72c2c7882e240e097 /net | |
| parent | 20c4515a1af770f4fb0dc6b044ffc9a6031e5767 (diff) | |
| parent | 58e9683d14752debc6f22daf6b23e031787df31f (diff) | |
| download | linux-672f5ccece3ba3fc851d9c73924ae16f39e4c176.tar.xz | |
Merge branch 'ieee802154-for-davem-2018-07-11' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan
Stefan Schmidt says:
====================
pull-request: ieee802154 for net 2018-07-11
An update from ieee802154 for your *net* tree.
Build system fix for a missing include from Arnd Bergmann.
Setting the IFLA_LINK for the lowpan parent from Lubomir Rintel.
Fixes for some RX corner cases in adf7242 driver by Michael Hennerich.
And some small patches to cleanup our BUG_ON vs WARN_ON usage.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ieee802154/6lowpan/core.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/ieee802154/6lowpan/core.c b/net/ieee802154/6lowpan/core.c index 275449b0d633..3297e7fa9945 100644 --- a/net/ieee802154/6lowpan/core.c +++ b/net/ieee802154/6lowpan/core.c @@ -90,12 +90,18 @@ static int lowpan_neigh_construct(struct net_device *dev, struct neighbour *n) return 0; } +static int lowpan_get_iflink(const struct net_device *dev) +{ + return lowpan_802154_dev(dev)->wdev->ifindex; +} + static const struct net_device_ops lowpan_netdev_ops = { .ndo_init = lowpan_dev_init, .ndo_start_xmit = lowpan_xmit, .ndo_open = lowpan_open, .ndo_stop = lowpan_stop, .ndo_neigh_construct = lowpan_neigh_construct, + .ndo_get_iflink = lowpan_get_iflink, }; static void lowpan_setup(struct net_device *ldev) |