Merge branch 'linus' into sfi-release

Conflicts:
	arch/x86/kernel/setup.c
	drivers/acpi/power.c
	init/main.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 7 insertions, 10 deletions

diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index f0f890803710..1d7d7fef414f 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -1344,7 +1344,7 @@ static inline int emac_xmit_finish(struct emac_instance *dev, int len)
         ++dev->stats.tx_packets;
         dev->stats.tx_bytes += len;
 
-        return 0;
+        return NETDEV_TX_OK;
 }
 
 /* Tx lock BH */
@@ -2209,7 +2209,7 @@ static const struct ethtool_ops emac_ethtool_ops = {
 static int emac_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
 {
         struct emac_instance *dev = netdev_priv(ndev);
-        uint16_t *data = (uint16_t *) & rq->ifr_ifru;
+        struct mii_ioctl_data *data = if_mii(rq);
 
         DBG(dev, "ioctl %08x" NL, cmd);
 
@@ -2218,19 +2218,16 @@ static int emac_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
 
         switch (cmd) {
         case SIOCGMIIPHY:
-        case SIOCDEVPRIVATE:
-                data[0] = dev->phy.address;
+                data->phy_id = dev->phy.address;
                 /* Fall through */
         case SIOCGMIIREG:
-        case SIOCDEVPRIVATE + 1:
-                data[3] = emac_mdio_read(ndev, dev->phy.address, data[1]);
+                data->val_out = emac_mdio_read(ndev, dev->phy.address,
+                                               data->reg_num);
                 return 0;
 
         case SIOCSMIIREG:
-        case SIOCDEVPRIVATE + 2:
-                if (!capable(CAP_NET_ADMIN))
-                        return -EPERM;
-                emac_mdio_write(ndev, dev->phy.address, data[1], data[2]);
+                emac_mdio_write(ndev, dev->phy.address, data->reg_num,
+                                data->val_in);
                 return 0;
         default:
                 return -EOPNOTSUPP;