Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h

1 files changed, 48 insertions, 16 deletions

diff --git a/drivers/ieee802154/fakehard.c b/drivers/ieee802154/fakehard.c
index 96a2959ce877..d9d0e13efe47 100644
--- a/drivers/ieee802154/fakehard.c
+++ b/drivers/ieee802154/fakehard.c
@@ -32,9 +32,29 @@
 #include <net/nl802154.h>
 #include <net/wpan-phy.h>
 
-struct wpan_phy *net_to_phy(struct net_device *dev)
+struct fakehard_priv {
+        struct wpan_phy *phy;
+};
+
+static struct wpan_phy *fake_to_phy(const struct net_device *dev)
+{
+        struct fakehard_priv *priv = netdev_priv(dev);
+        return priv->phy;
+}
+
+/**
+ * fake_get_phy - Return a phy corresponding to this device.
+ * @dev: The network device for which to return the wan-phy object
+ *
+ * This function returns a wpan-phy object corresponding to the passed
+ * network device. Reference counter for wpan-phy object is incremented,
+ * so when the wpan-phy isn't necessary, you should drop the reference
+ * via @wpan_phy_put() call.
+ */
+static struct wpan_phy *fake_get_phy(const struct net_device *dev)
 {
-        return container_of(dev->dev.parent, struct wpan_phy, dev);
+        struct wpan_phy *phy = fake_to_phy(dev);
+        return to_phy(get_device(&phy->dev));
 }
 
 /**
@@ -43,7 +63,7 @@ struct wpan_phy *net_to_phy(struct net_device *dev)
  *
  * Return the ID of the PAN from the PIB.
  */
-static u16 fake_get_pan_id(struct net_device *dev)
+static u16 fake_get_pan_id(const struct net_device *dev)
 {
         BUG_ON(dev->type != ARPHRD_IEEE802154);
 
@@ -58,7 +78,7 @@ static u16 fake_get_pan_id(struct net_device *dev)
  * device. If the device has not yet had a short address assigned
  * then this should return 0xFFFF to indicate a lack of association.
  */
-static u16 fake_get_short_addr(struct net_device *dev)
+static u16 fake_get_short_addr(const struct net_device *dev)
 {
         BUG_ON(dev->type != ARPHRD_IEEE802154);
 
@@ -78,7 +98,7 @@ static u16 fake_get_short_addr(struct net_device *dev)
  * Note: This is in section 7.2.1.2 of the IEEE 802.15.4-2006
  *       document.
  */
-static u8 fake_get_dsn(struct net_device *dev)
+static u8 fake_get_dsn(const struct net_device *dev)
 {
         BUG_ON(dev->type != ARPHRD_IEEE802154);
 
@@ -98,7 +118,7 @@ static u8 fake_get_dsn(struct net_device *dev)
  * Note: This is in section 7.2.1.2 of the IEEE 802.15.4-2006
  *       document.
  */
-static u8 fake_get_bsn(struct net_device *dev)
+static u8 fake_get_bsn(const struct net_device *dev)
 {
         BUG_ON(dev->type != ARPHRD_IEEE802154);
 
@@ -121,7 +141,7 @@ static u8 fake_get_bsn(struct net_device *dev)
 static int fake_assoc_req(struct net_device *dev,
                 struct ieee802154_addr *addr, u8 channel, u8 page, u8 cap)
 {
-        struct wpan_phy *phy = net_to_phy(dev);
+        struct wpan_phy *phy = fake_to_phy(dev);
 
         mutex_lock(&phy->pib_lock);
         phy->current_channel = channel;
@@ -196,7 +216,7 @@ static int fake_start_req(struct net_device *dev, struct ieee802154_addr *addr,
                                 u8 bcn_ord, u8 sf_ord, u8 pan_coord, u8 blx,
                                 u8 coord_realign)
 {
-        struct wpan_phy *phy = net_to_phy(dev);
+        struct wpan_phy *phy = fake_to_phy(dev);
 
         mutex_lock(&phy->pib_lock);
         phy->current_channel = channel;
@@ -239,6 +259,8 @@ static struct ieee802154_mlme_ops fake_mlme = {
         .start_req = fake_start_req,
         .scan_req = fake_scan_req,
 
+        .get_phy = fake_get_phy,
+
         .get_pan_id = fake_get_pan_id,
         .get_short_addr = fake_get_short_addr,
         .get_dsn = fake_get_dsn,
@@ -260,15 +282,12 @@ static int ieee802154_fake_close(struct net_device *dev)
 static netdev_tx_t ieee802154_fake_xmit(struct sk_buff *skb,
                                               struct net_device *dev)
 {
-        skb->iif = dev->ifindex;
-        skb->dev = dev;
         dev->stats.tx_packets++;
         dev->stats.tx_bytes += skb->len;
 
-        dev->trans_start = jiffies;
-
         /* FIXME: do hardware work here ... */
 
+        dev_kfree_skb(skb);
         return NETDEV_TX_OK;
 }
 
@@ -313,7 +332,7 @@ static const struct net_device_ops fake_ops = {
 
 static void ieee802154_fake_destruct(struct net_device *dev)
 {
-        struct wpan_phy *phy = net_to_phy(dev);
+        struct wpan_phy *phy = fake_to_phy(dev);
 
         wpan_phy_unregister(phy);
         free_netdev(dev);
@@ -338,13 +357,14 @@ static void ieee802154_fake_setup(struct net_device *dev)
 static int __devinit ieee802154fake_probe(struct platform_device *pdev)
 {
         struct net_device *dev;
+        struct fakehard_priv *priv;
         struct wpan_phy *phy = wpan_phy_alloc(0);
         int err;
 
         if (!phy)
                 return -ENOMEM;
 
-        dev = alloc_netdev(0, "hardwpan%d", ieee802154_fake_setup);
+        dev = alloc_netdev(sizeof(struct fakehard_priv), "hardwpan%d", ieee802154_fake_setup);
         if (!dev) {
                 wpan_phy_free(phy);
                 return -ENOMEM;
@@ -356,12 +376,23 @@ static int __devinit ieee802154fake_probe(struct platform_device *pdev)
                         dev->addr_len);
         memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
 
-        phy->channels_supported = (1 << 27) - 1;
+        /*
+         * For now we'd like to emulate 2.4 GHz-only device,
+         * both O-QPSK and CSS
+         */
+        /* 2.4 GHz O-QPSK 802.15.4-2003 */
+        phy->channels_supported[0] |= 0x7FFF800;
+        /* 2.4 GHz CSS 802.15.4a-2007 */
+        phy->channels_supported[3] |= 0x3fff;
+
         phy->transmit_power = 0xbf;
 
         dev->netdev_ops = &fake_ops;
         dev->ml_priv = &fake_mlme;
 
+        priv = netdev_priv(dev);
+        priv->phy = phy;
+
         /*
          * If the name is a format string the caller wants us to do a
          * name allocation.
@@ -372,11 +403,12 @@ static int __devinit ieee802154fake_probe(struct platform_device *pdev)
                         goto out;
         }
 
+        wpan_phy_set_dev(phy, &pdev->dev);
         SET_NETDEV_DEV(dev, &phy->dev);
 
         platform_set_drvdata(pdev, dev);
 
-        err = wpan_phy_register(&pdev->dev, phy);
+        err = wpan_phy_register(phy);
         if (err)
                 goto out;