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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (45 commits)
  be2net: Add detect UE feature for Lancer
  be2net: Prevent CQ full condition for Lancer
  be2net: Fix disabling multicast promiscous mode
  be2net: Fix endian issue in RX filter command
  af_packet: de-inline some helper functions
  MAINTAINERS: Add can-gw include to maintained files
  net: Add back alignment for size for __alloc_skb
  net: add missing bh_unlock_sock() calls
  l2tp: fix race in l2tp_recv_dequeue()
  ixgbevf: Update release version
  ixgbe: DCB, return max for IEEE traffic classes
  ixgbe: fix reading of the buffer returned by the firmware
  ixgbe: Fix compiler warnings
  ixgbe: fix smatch splat due to missing NULL check
  ixgbe: fix disabling of Tx laser at probe
  ixgbe: Fix link issues caused by a reset while interface is down
  igb: Fix for I347AT4 PHY cable length unit detection
  e100: make sure vlan support isn't advertised on old adapters
  e1000e: demote a debugging WARN to a debug log message
  net: fix typo in drivers/net/ethernet/xilinx/ll_temac_main.c
  ...

25 files changed, 157 insertions, 105 deletions

diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 6dff5a0e733f..597f4d45c632 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -159,6 +159,7 @@ config S6GMAC
           will be called s6gmac.
 
 source "drivers/net/ethernet/seeq/Kconfig"
+source "drivers/net/ethernet/silan/Kconfig"
 source "drivers/net/ethernet/sis/Kconfig"
 source "drivers/net/ethernet/sfc/Kconfig"
 source "drivers/net/ethernet/sgi/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index c53ad3afc991..be5dde040261 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -58,6 +58,7 @@ obj-$(CONFIG_SH_ETH) += renesas/
 obj-$(CONFIG_NET_VENDOR_RDC) += rdc/
 obj-$(CONFIG_S6GMAC) += s6gmac.o
 obj-$(CONFIG_NET_VENDOR_SEEQ) += seeq/
+obj-$(CONFIG_NET_VENDOR_SILAN) += silan/
 obj-$(CONFIG_NET_VENDOR_SIS) += sis/
 obj-$(CONFIG_SFC) += sfc/
 obj-$(CONFIG_NET_VENDOR_SGI) += sgi/
diff --git a/drivers/net/ethernet/apple/Kconfig b/drivers/net/ethernet/apple/Kconfig
index a759d5483ab9..1375e2dc9468 100644
--- a/drivers/net/ethernet/apple/Kconfig
+++ b/drivers/net/ethernet/apple/Kconfig
@@ -52,18 +52,6 @@ config BMAC
           To compile this driver as a module, choose M here: the module
           will be called bmac.
 
-config MAC89x0
-        tristate "Macintosh CS89x0 based ethernet cards"
-        depends on MAC
-        ---help---
-          Support for CS89x0 chipset based Ethernet cards.  If you have a
-          Nubus or LC-PDS network (Ethernet) card of this type, say Y and
-          read the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-
-          To compile this driver as a module, choose M here. This module will
-          be called mac89x0.
-
 config MACMACE
         bool "Macintosh (AV) onboard MACE ethernet"
         depends on MAC
diff --git a/drivers/net/ethernet/apple/Makefile b/drivers/net/ethernet/apple/Makefile
index 0d3a5919c95b..86eaa17af0f4 100644
--- a/drivers/net/ethernet/apple/Makefile
+++ b/drivers/net/ethernet/apple/Makefile
@@ -4,5 +4,4 @@
 
 obj-$(CONFIG_MACE) += mace.o
 obj-$(CONFIG_BMAC) += bmac.o
-obj-$(CONFIG_MAC89x0) += mac89x0.o
 obj-$(CONFIG_MACMACE) += macmace.o
diff --git a/drivers/net/ethernet/cirrus/Kconfig b/drivers/net/ethernet/cirrus/Kconfig
index 6cbb81ccc02e..1f8648f099c7 100644
--- a/drivers/net/ethernet/cirrus/Kconfig
+++ b/drivers/net/ethernet/cirrus/Kconfig
@@ -6,7 +6,7 @@ config NET_VENDOR_CIRRUS
         bool "Cirrus devices"
         default y
         depends on ISA || EISA || MACH_IXDP2351 || ARCH_IXDP2X01 \
-                || MACH_MX31ADS || MACH_QQ2440 || (ARM && ARCH_EP93XX)
+                || MACH_MX31ADS || MACH_QQ2440 || (ARM && ARCH_EP93XX) || MAC
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
           and read the Ethernet-HOWTO, available from
@@ -47,4 +47,16 @@ config EP93XX_ETH
           This is a driver for the ethernet hardware included in EP93xx CPUs.
           Say Y if you are building a kernel for EP93xx based devices.
 
+config MAC89x0
+        tristate "Macintosh CS89x0 based ethernet cards"
+        depends on MAC
+        ---help---
+          Support for CS89x0 chipset based Ethernet cards.  If you have a
+          Nubus or LC-PDS network (Ethernet) card of this type, say Y and
+          read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+
+          To compile this driver as a module, choose M here. This module will
+          be called mac89x0.
+
 endif # NET_VENDOR_CIRRUS
diff --git a/drivers/net/ethernet/cirrus/Makefile b/drivers/net/ethernet/cirrus/Makefile
index 14bd77e0cb57..ca245e2b5d98 100644
--- a/drivers/net/ethernet/cirrus/Makefile
+++ b/drivers/net/ethernet/cirrus/Makefile
@@ -4,3 +4,4 @@
 
 obj-$(CONFIG_CS89x0) += cs89x0.o
 obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o
+obj-$(CONFIG_MAC89x0) += mac89x0.o
diff --git a/drivers/net/ethernet/apple/mac89x0.c b/drivers/net/ethernet/cirrus/mac89x0.c
index 83781f316d1f..83781f316d1f 100644
--- a/drivers/net/ethernet/apple/mac89x0.c
+++ b/drivers/net/ethernet/cirrus/mac89x0.c
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index 824b8e6021f6..2c7b36673dfc 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -318,8 +318,7 @@ static int be_mbox_db_ready_wait(struct be_adapter *adapter, void __iomem *db)
 
                 if (msecs > 4000) {
                         dev_err(&adapter->pdev->dev, "mbox poll timed out\n");
-                        if (!lancer_chip(adapter))
-                                be_detect_dump_ue(adapter);
+                        be_detect_dump_ue(adapter);
                         return -1;
                 }
 
@@ -1540,7 +1539,14 @@ int be_cmd_rx_filter(struct be_adapter *adapter, u32 flags, u32 value)
 
                 req->if_flags_mask = req->if_flags =
                                 cpu_to_le32(BE_IF_FLAGS_MULTICAST);
-                req->mcast_num = cpu_to_le16(netdev_mc_count(adapter->netdev));
+
+                /* Reset mcast promisc mode if already set by setting mask
+                 * and not setting flags field
+                 */
+                req->if_flags_mask |=
+                                cpu_to_le32(BE_IF_FLAGS_MCAST_PROMISCUOUS);
+
+                req->mcast_num = cpu_to_le32(netdev_mc_count(adapter->netdev));
                 netdev_for_each_mc_addr(ha, adapter->netdev)
                         memcpy(req->mcast_mac[i++].byte, ha->addr, ETH_ALEN);
         }
diff --git a/drivers/net/ethernet/emulex/benet/be_hw.h b/drivers/net/ethernet/emulex/benet/be_hw.h
index fbc8a915519e..f2c89e3ccabd 100644
--- a/drivers/net/ethernet/emulex/benet/be_hw.h
+++ b/drivers/net/ethernet/emulex/benet/be_hw.h
@@ -48,6 +48,8 @@
 /* Lancer SLIPORT_CONTROL SLIPORT_STATUS registers */
 #define SLIPORT_STATUS_OFFSET           0x404
 #define SLIPORT_CONTROL_OFFSET          0x408
+#define SLIPORT_ERROR1_OFFSET           0x40C
+#define SLIPORT_ERROR2_OFFSET           0x410
 
 #define SLIPORT_STATUS_ERR_MASK         0x80000000
 #define SLIPORT_STATUS_RN_MASK          0x01000000
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 21804972fa2f..e0aed188c57f 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -1905,6 +1905,8 @@ loop_continue:
                 be_rx_stats_update(rxo, rxcp);
         }
 
+        be_cq_notify(adapter, rx_cq->id, false, work_done);
+
         /* Refill the queue */
         if (work_done && atomic_read(&rxo->q.used) < RX_FRAGS_REFILL_WM)
                 be_post_rx_frags(rxo, GFP_ATOMIC);
@@ -1912,10 +1914,8 @@ loop_continue:
         /* All consumed */
         if (work_done < budget) {
                 napi_complete(napi);
-                be_cq_notify(adapter, rx_cq->id, true, work_done);
-        } else {
-                /* More to be consumed; continue with interrupts disabled */
-                be_cq_notify(adapter, rx_cq->id, false, work_done);
+                /* Arm CQ */
+                be_cq_notify(adapter, rx_cq->id, true, 0);
         }
         return work_done;
 }
@@ -1977,42 +1977,62 @@ static int be_poll_tx_mcc(struct napi_struct *napi, int budget)
 
 void be_detect_dump_ue(struct be_adapter *adapter)
 {
-        u32 ue_status_lo, ue_status_hi, ue_status_lo_mask, ue_status_hi_mask;
+        u32 ue_lo = 0, ue_hi = 0, ue_lo_mask = 0, ue_hi_mask = 0;
+        u32 sliport_status = 0, sliport_err1 = 0, sliport_err2 = 0;
         u32 i;
 
-        pci_read_config_dword(adapter->pdev,
-                                PCICFG_UE_STATUS_LOW, &ue_status_lo);
-        pci_read_config_dword(adapter->pdev,
-                                PCICFG_UE_STATUS_HIGH, &ue_status_hi);
-        pci_read_config_dword(adapter->pdev,
-                                PCICFG_UE_STATUS_LOW_MASK, &ue_status_lo_mask);
-        pci_read_config_dword(adapter->pdev,
-                                PCICFG_UE_STATUS_HI_MASK, &ue_status_hi_mask);
+        if (lancer_chip(adapter)) {
+                sliport_status = ioread32(adapter->db + SLIPORT_STATUS_OFFSET);
+                if (sliport_status & SLIPORT_STATUS_ERR_MASK) {
+                        sliport_err1 = ioread32(adapter->db +
+                                        SLIPORT_ERROR1_OFFSET);
+                        sliport_err2 = ioread32(adapter->db +
+                                        SLIPORT_ERROR2_OFFSET);
+                }
+        } else {
+                pci_read_config_dword(adapter->pdev,
+                                PCICFG_UE_STATUS_LOW, &ue_lo);
+                pci_read_config_dword(adapter->pdev,
+                                PCICFG_UE_STATUS_HIGH, &ue_hi);
+                pci_read_config_dword(adapter->pdev,
+                                PCICFG_UE_STATUS_LOW_MASK, &ue_lo_mask);
+                pci_read_config_dword(adapter->pdev,
+                                PCICFG_UE_STATUS_HI_MASK, &ue_hi_mask);
 
-        ue_status_lo = (ue_status_lo & (~ue_status_lo_mask));
-        ue_status_hi = (ue_status_hi & (~ue_status_hi_mask));
+                ue_lo = (ue_lo & (~ue_lo_mask));
+                ue_hi = (ue_hi & (~ue_hi_mask));
+        }
 
-        if (ue_status_lo || ue_status_hi) {
+        if (ue_lo || ue_hi ||
+                sliport_status & SLIPORT_STATUS_ERR_MASK) {
                 adapter->ue_detected = true;
                 adapter->eeh_err = true;
                 dev_err(&adapter->pdev->dev, "UE Detected!!\n");
         }
 
-        if (ue_status_lo) {
-                for (i = 0; ue_status_lo; ue_status_lo >>= 1, i++) {
-                        if (ue_status_lo & 1)
+        if (ue_lo) {
+                for (i = 0; ue_lo; ue_lo >>= 1, i++) {
+                        if (ue_lo & 1)
                                 dev_err(&adapter->pdev->dev,
                                 "UE: %s bit set\n", ue_status_low_desc[i]);
                 }
         }
-        if (ue_status_hi) {
-                for (i = 0; ue_status_hi; ue_status_hi >>= 1, i++) {
-                        if (ue_status_hi & 1)
+        if (ue_hi) {
+                for (i = 0; ue_hi; ue_hi >>= 1, i++) {
+                        if (ue_hi & 1)
                                 dev_err(&adapter->pdev->dev,
                                 "UE: %s bit set\n", ue_status_hi_desc[i]);
                 }
         }
 
+        if (sliport_status & SLIPORT_STATUS_ERR_MASK) {
+                dev_err(&adapter->pdev->dev,
+                        "sliport status 0x%x\n", sliport_status);
+                dev_err(&adapter->pdev->dev,
+                        "sliport error1 0x%x\n", sliport_err1);
+                dev_err(&adapter->pdev->dev,
+                        "sliport error2 0x%x\n", sliport_err2);
+        }
 }
 
 static void be_worker(struct work_struct *work)
@@ -2022,7 +2042,7 @@ static void be_worker(struct work_struct *work)
         struct be_rx_obj *rxo;
         int i;
 
-        if (!adapter->ue_detected && !lancer_chip(adapter))
+        if (!adapter->ue_detected)
                 be_detect_dump_ue(adapter);
 
         /* when interrupts are not yet enabled, just reap any pending
diff --git a/drivers/net/ethernet/i825xx/3c505.c b/drivers/net/ethernet/i825xx/3c505.c
index 40e1a175fceb..ba82a266051d 100644
--- a/drivers/net/ethernet/i825xx/3c505.c
+++ b/drivers/net/ethernet/i825xx/3c505.c
@@ -126,15 +126,13 @@
  *
  *********************************************************/
 
-#define filename __FILE__
-
 #define timeout_msg "*** timeout at %s:%s (line %d) ***\n"
 #define TIMEOUT_MSG(lineno) \
-        pr_notice(timeout_msg, filename, __func__, (lineno))
+        pr_notice(timeout_msg, __FILE__, __func__, (lineno))
 
 #define invalid_pcb_msg "*** invalid pcb length %d at %s:%s (line %d) ***\n"
 #define INVALID_PCB_MSG(len) \
-        pr_notice(invalid_pcb_msg, (len), filename, __func__, __LINE__)
+        pr_notice(invalid_pcb_msg, (len), __FILE__, __func__, __LINE__)
 
 #define search_msg "%s: Looking for 3c505 adapter at address %#x..."
 
diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
index ae17cd1a907f..5a2fdf7a00c8 100644
--- a/drivers/net/ethernet/intel/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
@@ -2810,6 +2810,10 @@ static int __devinit e100_probe(struct pci_dev *pdev,
 
         e100_get_defaults(nic);
 
+        /* D100 MAC doesn't allow rx of vlan packets with normal MTU */
+        if (nic->mac < mac_82558_D101_A4)
+                netdev->features |= NETIF_F_VLAN_CHALLENGED;
+
         /* locks must be initialized before calling hw_reset */
         spin_lock_init(&nic->cb_lock);
         spin_lock_init(&nic->cmd_lock);
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index 6a17c62cb86f..e2a80a283fd3 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -866,8 +866,7 @@ static s32 e1000_acquire_swflag_ich8lan(struct e1000_hw *hw)
 
         if (test_and_set_bit(__E1000_ACCESS_SHARED_RESOURCE,
                              &hw->adapter->state)) {
-                WARN(1, "e1000e: %s: contention for Phy access\n",
-                     hw->adapter->netdev->name);
+                e_dbg("contention for Phy access\n");
                 return -E1000_ERR_PHY;
         }
 
diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c
index 7edf31efe756..b17d7c20f817 100644
--- a/drivers/net/ethernet/intel/igb/e1000_phy.c
+++ b/drivers/net/ethernet/intel/igb/e1000_phy.c
@@ -1687,7 +1687,7 @@ s32 igb_get_cable_length_m88_gen2(struct e1000_hw *hw)
                 if (ret_val)
                         goto out;
 
-                is_cm = !(phy_data & I347AT4_PCDC_CABLE_LENGTH_UNIT);
+                is_cm = !(phy_data2 & I347AT4_PCDC_CABLE_LENGTH_UNIT);
 
                 /* Populate the phy structure with cable length in meters */
                 phy->min_cable_length = phy_data / (is_cm ? 100 : 1);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
index 834f044be4c3..f1365fef4ed2 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
@@ -3344,7 +3344,7 @@ static u8 ixgbe_calculate_checksum(u8 *buffer, u32 length)
 static s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer,
                                         u32 length)
 {
-        u32 hicr, i;
+        u32 hicr, i, bi;
         u32 hdr_size = sizeof(struct ixgbe_hic_hdr);
         u8 buf_len, dword_len;
 
@@ -3398,9 +3398,9 @@ static s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer,
         dword_len = hdr_size >> 2;
 
         /* first pull in the header so we know the buffer length */
-        for (i = 0; i < dword_len; i++) {
-                buffer[i] = IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG, i);
-                le32_to_cpus(&buffer[i]);
+        for (bi = 0; bi < dword_len; bi++) {
+                buffer[bi] = IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG, bi);
+                le32_to_cpus(&buffer[bi]);
         }
 
         /* If there is any thing in data position pull it in */
@@ -3414,12 +3414,14 @@ static s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer,
                 goto out;
         }
 
-        /* Calculate length in DWORDs, add one for odd lengths */
-        dword_len = (buf_len + 1) >> 2;
+        /* Calculate length in DWORDs, add 3 for odd lengths */
+        dword_len = (buf_len + 3) >> 2;
 
-        /* Pull in the rest of the buffer (i is where we left off)*/
-        for (; i < buf_len; i++)
-                buffer[i] = IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG, i);
+        /* Pull in the rest of the buffer (bi is where we left off)*/
+        for (; bi <= dword_len; bi++) {
+                buffer[bi] = IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG, bi);
+                le32_to_cpus(&buffer[bi]);
+        }
 
 out:
         return ret_val;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
index 3631d639d86a..33b93ffb87cb 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
@@ -561,11 +561,12 @@ static int ixgbe_dcbnl_ieee_getets(struct net_device *dev,
         struct ixgbe_adapter *adapter = netdev_priv(dev);
         struct ieee_ets *my_ets = adapter->ixgbe_ieee_ets;
 
+        ets->ets_cap = adapter->dcb_cfg.num_tcs.pg_tcs;
+
         /* No IEEE PFC settings available */
         if (!my_ets)
-                return -EINVAL;
+                return 0;
 
-        ets->ets_cap = adapter->dcb_cfg.num_tcs.pg_tcs;
         ets->cbs = my_ets->cbs;
         memcpy(ets->tc_tx_bw, my_ets->tc_tx_bw, sizeof(ets->tc_tx_bw));
         memcpy(ets->tc_rx_bw, my_ets->tc_rx_bw, sizeof(ets->tc_rx_bw));
@@ -621,11 +622,12 @@ static int ixgbe_dcbnl_ieee_getpfc(struct net_device *dev,
         struct ieee_pfc *my_pfc = adapter->ixgbe_ieee_pfc;
         int i;
 
+        pfc->pfc_cap = adapter->dcb_cfg.num_tcs.pfc_tcs;
+
         /* No IEEE PFC settings available */
         if (!my_pfc)
-                return -EINVAL;
+                return 0;
 
-        pfc->pfc_cap = adapter->dcb_cfg.num_tcs.pfc_tcs;
         pfc->pfc_en = my_pfc->pfc_en;
         pfc->mbc = my_pfc->mbc;
         pfc->delay = my_pfc->delay;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 09b8e88b2999..8ef92d1a6aa1 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -3345,34 +3345,25 @@ static void ixgbe_configure_dcb(struct ixgbe_adapter *adapter)
 
         hw->mac.ops.set_vfta(&adapter->hw, 0, 0, true);
 
-        /* reconfigure the hardware */
-        if (adapter->dcbx_cap & DCB_CAP_DCBX_VER_CEE) {
 #ifdef IXGBE_FCOE
-                if (adapter->netdev->features & NETIF_F_FCOE_MTU)
-                        max_frame = max(max_frame, IXGBE_FCOE_JUMBO_FRAME_SIZE);
+        if (adapter->netdev->features & NETIF_F_FCOE_MTU)
+                max_frame = max(max_frame, IXGBE_FCOE_JUMBO_FRAME_SIZE);
 #endif
+
+        /* reconfigure the hardware */
+        if (adapter->dcbx_cap & DCB_CAP_DCBX_VER_CEE) {
                 ixgbe_dcb_calculate_tc_credits(hw, &adapter->dcb_cfg, max_frame,
                                                 DCB_TX_CONFIG);
                 ixgbe_dcb_calculate_tc_credits(hw, &adapter->dcb_cfg, max_frame,
                                                 DCB_RX_CONFIG);
                 ixgbe_dcb_hw_config(hw, &adapter->dcb_cfg);
-        } else {
-                struct net_device *dev = adapter->netdev;
-
-                if (adapter->ixgbe_ieee_ets) {
-                        struct ieee_ets *ets = adapter->ixgbe_ieee_ets;
-                        int max_frame = dev->mtu + ETH_HLEN + ETH_FCS_LEN;
-
-                        ixgbe_dcb_hw_ets(&adapter->hw, ets, max_frame);
-                }
-
-                if (adapter->ixgbe_ieee_pfc) {
-                        struct ieee_pfc *pfc = adapter->ixgbe_ieee_pfc;
-                        u8 *prio_tc = adapter->ixgbe_ieee_ets->prio_tc;
-
-                        ixgbe_dcb_hw_pfc_config(&adapter->hw, pfc->pfc_en,
-                                                prio_tc);
-                }
+        } else if (adapter->ixgbe_ieee_ets && adapter->ixgbe_ieee_pfc) {
+                ixgbe_dcb_hw_ets(&adapter->hw,
+                                 adapter->ixgbe_ieee_ets,
+                                 max_frame);
+                ixgbe_dcb_hw_pfc_config(&adapter->hw,
+                                        adapter->ixgbe_ieee_pfc->pfc_en,
+                                        adapter->ixgbe_ieee_ets->prio_tc);
         }
 
         /* Enable RSS Hash per TC */
@@ -6125,7 +6116,6 @@ static void ixgbe_sfp_link_config_subtask(struct ixgbe_adapter *adapter)
         autoneg = hw->phy.autoneg_advertised;
         if ((!autoneg) && (hw->mac.ops.get_link_capabilities))
                 hw->mac.ops.get_link_capabilities(hw, &autoneg, &negotiation);
-        hw->mac.autotry_restart = false;
         if (hw->mac.ops.setup_link)
                 hw->mac.ops.setup_link(hw, autoneg, negotiation, true);
 
@@ -7589,13 +7579,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
                 goto err_eeprom;
         }
 
-        /* power down the optics for multispeed fiber and 82599 SFP+ fiber */
-        if (hw->mac.ops.disable_tx_laser &&
-            ((hw->phy.multispeed_fiber) ||
-             ((hw->mac.ops.get_media_type(hw) == ixgbe_media_type_fiber) &&
-              (hw->mac.type == ixgbe_mac_82599EB))))
-                hw->mac.ops.disable_tx_laser(hw);
-
         setup_timer(&adapter->service_timer, &ixgbe_service_timer,
                     (unsigned long) adapter);
 
@@ -7693,6 +7676,13 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
         if (err)
                 goto err_register;
 
+        /* power down the optics for multispeed fiber and 82599 SFP+ fiber */
+        if (hw->mac.ops.disable_tx_laser &&
+            ((hw->phy.multispeed_fiber) ||
+             ((hw->mac.ops.get_media_type(hw) == ixgbe_media_type_fiber) &&
+              (hw->mac.type == ixgbe_mac_82599EB))))
+                hw->mac.ops.disable_tx_laser(hw);
+
         /* carrier off reporting is important to ethtool even BEFORE open */
         netif_carrier_off(netdev);
 
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
index 5a7e1eb33599..4a5d8897faab 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
@@ -42,10 +42,12 @@ int ixgbe_ndo_set_vf_spoofchk(struct net_device *netdev, int vf, bool setting);
 int ixgbe_ndo_get_vf_config(struct net_device *netdev,
                             int vf, struct ifla_vf_info *ivi);
 void ixgbe_check_vf_rate_limit(struct ixgbe_adapter *adapter);
+#ifdef CONFIG_PCI_IOV
 void ixgbe_disable_sriov(struct ixgbe_adapter *adapter);
 void ixgbe_enable_sriov(struct ixgbe_adapter *adapter,
                         const struct ixgbe_info *ii);
 int ixgbe_check_vf_assignment(struct ixgbe_adapter *adapter);
+#endif
 
 
 #endif /* _IXGBE_SRIOV_H_ */
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 5e92cc2079bd..4c8e19951d57 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -54,7 +54,7 @@ char ixgbevf_driver_name[] = "ixgbevf";
 static const char ixgbevf_driver_string[] =
         "Intel(R) 10 Gigabit PCI Express Virtual Function Network Driver";
 
-#define DRV_VERSION "2.1.0-k"
+#define DRV_VERSION "2.2.0-k"
 const char ixgbevf_driver_version[] = DRV_VERSION;
 static char ixgbevf_copyright[] =
         "Copyright (c) 2009 - 2010 Intel Corporation.";
diff --git a/drivers/net/ethernet/realtek/Kconfig b/drivers/net/ethernet/realtek/Kconfig
index 84083ec6e612..0578859a3c73 100644
--- a/drivers/net/ethernet/realtek/Kconfig
+++ b/drivers/net/ethernet/realtek/Kconfig
@@ -115,16 +115,4 @@ config R8169
           To compile this driver as a module, choose M here: the module
           will be called r8169.  This is recommended.
 
-config SC92031
-        tristate "Silan SC92031 PCI Fast Ethernet Adapter driver (EXPERIMENTAL)"
-        depends on PCI && EXPERIMENTAL
-        select CRC32
-        ---help---
-          This is a driver for the Fast Ethernet PCI network cards based on
-          the Silan SC92031 chip (sometimes also called Rsltek 8139D). If you
-          have one of these, say Y here.
-
-          To compile this driver as a module, choose M here: the module
-          will be called sc92031.  This is recommended.
-
 endif # NET_VENDOR_REALTEK
diff --git a/drivers/net/ethernet/realtek/Makefile b/drivers/net/ethernet/realtek/Makefile
index e48cfb6ac42d..71b1da30ecb5 100644
--- a/drivers/net/ethernet/realtek/Makefile
+++ b/drivers/net/ethernet/realtek/Makefile
@@ -6,4 +6,3 @@ obj-$(CONFIG_8139CP) += 8139cp.o
 obj-$(CONFIG_8139TOO) += 8139too.o
 obj-$(CONFIG_ATP) += atp.o
 obj-$(CONFIG_R8169) += r8169.o
-obj-$(CONFIG_SC92031) += sc92031.o
diff --git a/drivers/net/ethernet/silan/Kconfig b/drivers/net/ethernet/silan/Kconfig
new file mode 100644
index 000000000000..ae1ce170864d
--- /dev/null
+++ b/drivers/net/ethernet/silan/Kconfig
@@ -0,0 +1,33 @@
+#
+# Silan device configuration
+#
+
+config NET_VENDOR_SILAN
+        bool "Silan devices"
+        default y
+        depends on PCI && EXPERIMENTAL
+        ---help---
+          If you have a network (Ethernet) card belonging to this class, say Y
+          and read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+
+          Note that the answer to this question doesn't directly affect the
+          kernel: saying N will just cause the configurator to skip all
+          the questions about Silan devices. If you say Y, you will be asked for
+          your specific card in the following questions.
+
+if NET_VENDOR_SILAN
+
+config SC92031
+        tristate "Silan SC92031 PCI Fast Ethernet Adapter driver (EXPERIMENTAL)"
+        depends on PCI && EXPERIMENTAL
+        select CRC32
+        ---help---
+          This is a driver for the Fast Ethernet PCI network cards based on
+          the Silan SC92031 chip (sometimes also called Rsltek 8139D). If you
+          have one of these, say Y here.
+
+          To compile this driver as a module, choose M here: the module
+          will be called sc92031.  This is recommended.
+
+endif # NET_VENDOR_SILAN
diff --git a/drivers/net/ethernet/silan/Makefile b/drivers/net/ethernet/silan/Makefile
new file mode 100644
index 000000000000..4ad3523dcb92
--- /dev/null
+++ b/drivers/net/ethernet/silan/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Silan network device drivers.
+#
+
+obj-$(CONFIG_SC92031) += sc92031.o
diff --git a/drivers/net/ethernet/realtek/sc92031.c b/drivers/net/ethernet/silan/sc92031.c
index a284d6440538..a284d6440538 100644
--- a/drivers/net/ethernet/realtek/sc92031.c
+++ b/drivers/net/ethernet/silan/sc92031.c
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index 4d1658e78dee..caf3659e173c 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -716,8 +716,8 @@ static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)
                 cur_p = &lp->tx_bd_v[lp->tx_bd_tail];
                 cur_p->phys = dma_map_single(ndev->dev.parent,
                                              skb_frag_address(frag),
-                                             frag_size(frag), DMA_TO_DEVICE);
-                cur_p->len = frag_size(frag);
+                                             skb_frag_size(frag), DMA_TO_DEVICE);
+                cur_p->len = skb_frag_size(frag);
                 cur_p->app0 = 0;
                 frag++;
         }