Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffaf4c76 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

parents 70e90679 939a9516

drivers/net/mlx4/en_netdev.c

+1 −1
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ static int mlx4_en_start_port(struct net_device *dev) 
	mlx4_en_release_rss_steer(priv);

rx_err:

	for (i = 0; i < priv->rx_ring_num; i++)

		mlx4_en_deactivate_rx_ring(priv, &priv->rx_ring[rx_index]);

		mlx4_en_deactivate_rx_ring(priv, &priv->rx_ring[i]);

cq_err:

	while (rx_index--)

		mlx4_en_deactivate_cq(priv, &priv->rx_cq[rx_index]);

drivers/net/sfc/ethtool.c

+2 −2
Original line number Diff line number Diff line
@@ -174,8 +174,8 @@ static struct efx_ethtool_stat efx_ethtool_stats[] = { 


/* EEPROM range with gPXE configuration */

#define EFX_ETHTOOL_EEPROM_MAGIC 0xEFAB

#define EFX_ETHTOOL_EEPROM_MIN 0x100U

#define EFX_ETHTOOL_EEPROM_MAX 0x400U

#define EFX_ETHTOOL_EEPROM_MIN 0x800U

#define EFX_ETHTOOL_EEPROM_MAX 0x1800U



/**************************************************************************

 *

drivers/net/usb/hso.c

+7 −5
Original line number Diff line number Diff line
@@ -2184,19 +2184,20 @@ static void hso_create_rfkill(struct hso_device *hso_dev, 
			     struct usb_interface *interface)

{

	struct hso_net *hso_net = dev2net(hso_dev);

	struct device *dev = hso_dev->dev;

	struct device *dev = &hso_net->net->dev;

	char *rfkn;



	hso_net->rfkill = rfkill_allocate(&interface_to_usbdev(interface)->dev,

				 RFKILL_TYPE_WLAN);

				 RFKILL_TYPE_WWAN);

	if (!hso_net->rfkill) {

		dev_err(dev, "%s - Out of memory", __func__);

		dev_err(dev, "%s - Out of memory\n", __func__);

		return;

	}

	rfkn = kzalloc(20, GFP_KERNEL);

	if (!rfkn) {

		rfkill_free(hso_net->rfkill);

		dev_err(dev, "%s - Out of memory", __func__);

		hso_net->rfkill = NULL;

		dev_err(dev, "%s - Out of memory\n", __func__);

		return;

	}

	snprintf(rfkn, 20, "hso-%d",
@@ -2209,7 +2210,8 @@ static void hso_create_rfkill(struct hso_device *hso_dev, 
		kfree(rfkn);

		hso_net->rfkill->name = NULL;

		rfkill_free(hso_net->rfkill);

		dev_err(dev, "%s - Failed to register rfkill", __func__);

		hso_net->rfkill = NULL;

		dev_err(dev, "%s - Failed to register rfkill\n", __func__);

		return;

	}

}