From: Alexander Aring Date: Sat, 25 Oct 2014 15:16:42 +0000 (+0200) Subject: mac802154: remove ieee802154_addr from driver_ops X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c6f635faf3bca66cf73f6b3319a054959e367b19;p=deliverable%2Flinux.git mac802154: remove ieee802154_addr from driver_ops This driver_ops callback function is never used by any driver. Signed-off-by: Alexander Aring Signed-off-by: Marcel Holtmann --- diff --git a/include/net/mac802154.h b/include/net/mac802154.h index eb0e1cb9ca98..b07d431c0b19 100644 --- a/include/net/mac802154.h +++ b/include/net/mac802154.h @@ -170,7 +170,6 @@ struct ieee802154_ops { int (*set_hw_addr_filt)(struct ieee802154_hw *hw, struct ieee802154_hw_addr_filt *filt, unsigned long changed); - int (*ieee_addr)(struct ieee802154_hw *hw, __le64 addr); int (*set_txpower)(struct ieee802154_hw *hw, int db); int (*set_lbt)(struct ieee802154_hw *hw, bool on); int (*set_cca_mode)(struct ieee802154_hw *hw, u8 mode); diff --git a/net/mac802154/main.c b/net/mac802154/main.c index 5ce3184bc674..0e9a6a203f7a 100644 --- a/net/mac802154/main.c +++ b/net/mac802154/main.c @@ -61,16 +61,6 @@ int mac802154_slave_open(struct net_device *dev) goto err; } - if (local->ops->ieee_addr) { - __le64 addr = ieee802154_devaddr_from_raw(dev->dev_addr); - - res = local->ops->ieee_addr(&local->hw, addr); - WARN_ON(res); - if (res) - goto err; - mac802154_dev_set_ieee_addr(dev); - } - netif_start_queue(dev); return 0; err: