Merge commit 'v3.17' into next

5 files changed, 64 insertions, 21 deletions

diff --git a/net/mac802154/ieee802154_dev.c b/net/mac802154/ieee802154_dev.c
index 2cf66d885e68..b36b2b996578 100644
--- a/net/mac802154/ieee802154_dev.c
+++ b/net/mac802154/ieee802154_dev.c
@@ -143,6 +143,7 @@ static void
 mac802154_del_iface(struct wpan_phy *phy, struct net_device *dev)
 {
         struct mac802154_sub_if_data *sdata;
+
         ASSERT_RTNL();
 
         sdata = netdev_priv(dev);
@@ -166,11 +167,13 @@ mac802154_add_iface(struct wpan_phy *phy, const char *name, int type)
         switch (type) {
         case IEEE802154_DEV_MONITOR:
                 dev = alloc_netdev(sizeof(struct mac802154_sub_if_data),
-                                   name, mac802154_monitor_setup);
+                                   name, NET_NAME_UNKNOWN,
+                                   mac802154_monitor_setup);
                 break;
         case IEEE802154_DEV_WPAN:
                 dev = alloc_netdev(sizeof(struct mac802154_sub_if_data),
-                                   name, mac802154_wpan_setup);
+                                   name, NET_NAME_UNKNOWN,
+                                   mac802154_wpan_setup);
                 break;
         default:
                 dev = NULL;
@@ -276,7 +279,8 @@ ieee802154_alloc_device(size_t priv_data_len, struct ieee802154_ops *ops)
         }
 
         priv = wpan_phy_priv(phy);
-        priv->hw.phy = priv->phy = phy;
+        priv->phy = phy;
+        priv->hw.phy = priv->phy;
         priv->hw.priv = (char *)priv + ALIGN(sizeof(*priv), NETDEV_ALIGN);
         priv->ops = ops;
 
@@ -302,29 +306,61 @@ EXPORT_SYMBOL(ieee802154_free_device);
 int ieee802154_register_device(struct ieee802154_dev *dev)
 {
         struct mac802154_priv *priv = mac802154_to_priv(dev);
-        int rc = -ENOMEM;
+        int rc = -ENOSYS;
+
+        if (dev->flags & IEEE802154_HW_TXPOWER) {
+                if (!priv->ops->set_txpower)
+                        goto out;
+
+                priv->phy->set_txpower = mac802154_set_txpower;
+        }
+
+        if (dev->flags & IEEE802154_HW_LBT) {
+                if (!priv->ops->set_lbt)
+                        goto out;
+
+                priv->phy->set_lbt = mac802154_set_lbt;
+        }
+
+        if (dev->flags & IEEE802154_HW_CCA_MODE) {
+                if (!priv->ops->set_cca_mode)
+                        goto out;
+
+                priv->phy->set_cca_mode = mac802154_set_cca_mode;
+        }
+
+        if (dev->flags & IEEE802154_HW_CCA_ED_LEVEL) {
+                if (!priv->ops->set_cca_ed_level)
+                        goto out;
+
+                priv->phy->set_cca_ed_level = mac802154_set_cca_ed_level;
+        }
+
+        if (dev->flags & IEEE802154_HW_CSMA_PARAMS) {
+                if (!priv->ops->set_csma_params)
+                        goto out;
+
+                priv->phy->set_csma_params = mac802154_set_csma_params;
+        }
+
+        if (dev->flags & IEEE802154_HW_FRAME_RETRIES) {
+                if (!priv->ops->set_frame_retries)
+                        goto out;
+
+                priv->phy->set_frame_retries = mac802154_set_frame_retries;
+        }
 
         priv->dev_workqueue =
                 create_singlethread_workqueue(wpan_phy_name(priv->phy));
-        if (!priv->dev_workqueue)
+        if (!priv->dev_workqueue) {
+                rc = -ENOMEM;
                 goto out;
+        }
 
         wpan_phy_set_dev(priv->phy, priv->hw.parent);
 
         priv->phy->add_iface = mac802154_add_iface;
         priv->phy->del_iface = mac802154_del_iface;
-        if (priv->ops->set_txpower)
-                priv->phy->set_txpower = mac802154_set_txpower;
-        if (priv->ops->set_lbt)
-                priv->phy->set_lbt = mac802154_set_lbt;
-        if (priv->ops->set_cca_mode)
-                priv->phy->set_cca_mode = mac802154_set_cca_mode;
-        if (priv->ops->set_cca_ed_level)
-                priv->phy->set_cca_ed_level = mac802154_set_cca_ed_level;
-        if (priv->ops->set_csma_params)
-                priv->phy->set_csma_params = mac802154_set_csma_params;
-        if (priv->ops->set_frame_retries)
-                priv->phy->set_frame_retries = mac802154_set_frame_retries;
 
         rc = wpan_phy_register(priv->phy);
         if (rc < 0)
diff --git a/net/mac802154/llsec.c b/net/mac802154/llsec.c
index 1456f73b02b9..457058142098 100644
--- a/net/mac802154/llsec.c
+++ b/net/mac802154/llsec.c
@@ -538,6 +538,7 @@ static int llsec_recover_addr(struct mac802154_llsec *sec,
                               struct ieee802154_addr *addr)
 {
         __le16 caddr = sec->params.coord_shortaddr;
+
         addr->pan_id = sec->params.pan_id;
 
         if (caddr == cpu_to_le16(IEEE802154_ADDR_BROADCAST)) {
diff --git a/net/mac802154/mib.c b/net/mac802154/mib.c
index 15aa2f2b03a7..868a040fd422 100644
--- a/net/mac802154/mib.c
+++ b/net/mac802154/mib.c
@@ -175,9 +175,9 @@ static void phy_chan_notify(struct work_struct *work)
 
         mutex_lock(&priv->hw->phy->pib_lock);
         res = hw->ops->set_channel(&hw->hw, priv->page, priv->chan);
-        if (res)
+        if (res) {
                 pr_debug("set_channel failed\n");
-        else {
+        } else {
                 priv->hw->phy->current_channel = priv->chan;
                 priv->hw->phy->current_page = priv->page;
         }
@@ -210,8 +210,9 @@ void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan)
                 INIT_WORK(&work->work, phy_chan_notify);
                 work->dev = dev;
                 queue_work(priv->hw->dev_workqueue, &work->work);
-        } else
+        } else {
                 mutex_unlock(&priv->hw->phy->pib_lock);
+        }
 }
 
 
diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c
index 6d1647399d4f..8124353646ae 100644
--- a/net/mac802154/tx.c
+++ b/net/mac802154/tx.c
@@ -98,6 +98,7 @@ netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb,
         if (!(priv->hw.flags & IEEE802154_HW_OMIT_CKSUM)) {
                 u16 crc = crc_ccitt(0, skb->data, skb->len);
                 u8 *data = skb_put(skb, 2);
+
                 data[0] = crc & 0xff;
                 data[1] = crc >> 8;
         }
diff --git a/net/mac802154/wpan.c b/net/mac802154/wpan.c
index 3c3069fd6971..547838822d5e 100644
--- a/net/mac802154/wpan.c
+++ b/net/mac802154/wpan.c
@@ -462,7 +462,10 @@ mac802154_subif_frame(struct mac802154_sub_if_data *sdata, struct sk_buff *skb,
                         skb->pkt_type = PACKET_OTHERHOST;
                 break;
         default:
-                break;
+                spin_unlock_bh(&sdata->mib_lock);
+                pr_debug("invalid dest mode\n");
+                kfree_skb(skb);
+                return NET_RX_DROP;
         }
 
         spin_unlock_bh(&sdata->mib_lock);
@@ -573,6 +576,7 @@ void mac802154_wpans_rx(struct mac802154_priv *priv, struct sk_buff *skb)
         ret = mac802154_parse_frame_start(skb, &hdr);
         if (ret) {
                 pr_debug("got invalid frame\n");
+                kfree_skb(skb);
                 return;
         }