Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/ethernet/freescale/fec_main.c
	drivers/net/ethernet/renesas/sh_eth.c
	net/ipv4/gre.c

The GRE conflict is between a bug fix (kfree_skb --> kfree_skb_list)
and the splitting of the gre.c code into seperate files.

The FEC conflict was two sets of changes adding ethtool support code
in an "!CONFIG_M5272" CPP protected block.

Finally the sh_eth.c conflict was between one commit add bits set
in the .eesr_err_check mask whilst another commit removed the
.tx_error_check member and assignments.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 13 insertions, 2 deletions

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index b6768821757b..1f7ff2268bd0 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -516,6 +516,7 @@ fec_restart(struct net_device *ndev, int duplex)
         /* Set MII speed */
         writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED);
 
+#if !defined(CONFIG_M5272)
         /* set RX checksum */
         val = readl(fep->hwp + FEC_RACC);
         if (fep->csum_flags & FLAG_RX_CSUM_ENABLED)
@@ -523,6 +524,7 @@ fec_restart(struct net_device *ndev, int duplex)
         else
                 val &= ~FEC_RACC_OPTIONS;
         writel(val, fep->hwp + FEC_RACC);
+#endif
 
         /*
          * The phy interface and speed need to get configured
@@ -575,6 +577,7 @@ fec_restart(struct net_device *ndev, int duplex)
 #endif
         }
 
+#if !defined(CONFIG_M5272)
         /* enable pause frame*/
         if ((fep->pause_flag & FEC_PAUSE_FLAG_ENABLE) ||
             ((fep->pause_flag & FEC_PAUSE_FLAG_AUTONEG) &&
@@ -592,6 +595,7 @@ fec_restart(struct net_device *ndev, int duplex)
         } else {
                 rcntl &= ~FEC_ENET_FCE;
         }
+#endif /* !defined(CONFIG_M5272) */
 
         writel(rcntl, fep->hwp + FEC_R_CNTRL);
 
@@ -1211,7 +1215,9 @@ static int fec_enet_mii_probe(struct net_device *ndev)
         /* mask with MAC supported features */
         if (id_entry->driver_data & FEC_QUIRK_HAS_GBIT) {
                 phy_dev->supported &= PHY_GBIT_FEATURES;
+#if !defined(CONFIG_M5272)
                 phy_dev->supported |= SUPPORTED_Pause;
+#endif
         }
         else
                 phy_dev->supported &= PHY_BASIC_FEATURES;
@@ -1396,6 +1402,8 @@ static int fec_enet_get_ts_info(struct net_device *ndev,
         }
 }
 
+#if !defined(CONFIG_M5272)
+
 static void fec_enet_get_pauseparam(struct net_device *ndev,
                                     struct ethtool_pauseparam *pause)
 {
@@ -1442,7 +1450,6 @@ static int fec_enet_set_pauseparam(struct net_device *ndev,
         return 0;
 }
 
-#ifndef CONFIG_M5272
 static const struct fec_stat {
         char name[ETH_GSTRING_LEN];
         u16 offset;
@@ -1541,7 +1548,7 @@ static int fec_enet_get_sset_count(struct net_device *dev, int sset)
                 return -EOPNOTSUPP;
         }
 }
-#endif
+#endif /* !defined(CONFIG_M5272) */
 
 static int fec_enet_nway_reset(struct net_device *dev)
 {
@@ -1555,8 +1562,10 @@ static int fec_enet_nway_reset(struct net_device *dev)
 }
 
 static const struct ethtool_ops fec_enet_ethtool_ops = {
+#if !defined(CONFIG_M5272)
         .get_pauseparam         = fec_enet_get_pauseparam,
         .set_pauseparam         = fec_enet_set_pauseparam,
+#endif
         .get_settings           = fec_enet_get_settings,
         .set_settings           = fec_enet_set_settings,
         .get_drvinfo            = fec_enet_get_drvinfo,
@@ -1996,10 +2005,12 @@ fec_probe(struct platform_device *pdev)
         /* setup board info structure */
         fep = netdev_priv(ndev);
 
+#if !defined(CONFIG_M5272)
         /* default enable pause frame auto negotiation */
         if (pdev->id_entry &&
             (pdev->id_entry->driver_data & FEC_QUIRK_HAS_GBIT))
                 fep->pause_flag |= FEC_PAUSE_FLAG_AUTONEG;
+#endif
 
         fep->hwp = devm_ioremap_resource(&pdev->dev, r);
         if (IS_ERR(fep->hwp)) {