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

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



Pull to get the thermal netlink multicast group name fix, otherwise
the assertion added in net-next to netlink to detect that kind of bug
makes systems unbootable for some folks.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2fa70df9 f4541d60

drivers/bluetooth/ath3k.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -73,9 +73,11 @@ static struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x03F0, 0x311D) },

	{ USB_DEVICE(0x03F0, 0x311D) },





	/* Atheros AR3012 with sflash firmware*/

	/* Atheros AR3012 with sflash firmware*/

	{ USB_DEVICE(0x0CF3, 0x0036) },

	{ USB_DEVICE(0x0CF3, 0x3004) },

	{ USB_DEVICE(0x0CF3, 0x3004) },

	{ USB_DEVICE(0x0CF3, 0x3008) },

	{ USB_DEVICE(0x0CF3, 0x3008) },

	{ USB_DEVICE(0x0CF3, 0x311D) },

	{ USB_DEVICE(0x0CF3, 0x311D) },

	{ USB_DEVICE(0x0CF3, 0x817a) },

	{ USB_DEVICE(0x13d3, 0x3375) },

	{ USB_DEVICE(0x13d3, 0x3375) },

	{ USB_DEVICE(0x04CA, 0x3004) },

	{ USB_DEVICE(0x04CA, 0x3004) },

	{ USB_DEVICE(0x04CA, 0x3005) },

	{ USB_DEVICE(0x04CA, 0x3005) },
@@ -107,9 +109,11 @@ MODULE_DEVICE_TABLE(usb, ath3k_table); 
static struct usb_device_id ath3k_blist_tbl[] = {

static struct usb_device_id ath3k_blist_tbl[] = {





	/* Atheros AR3012 with sflash firmware*/

	/* Atheros AR3012 with sflash firmware*/

	{ USB_DEVICE(0x0CF3, 0x0036), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0CF3, 0x817a), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },

drivers/bluetooth/btusb.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -131,9 +131,11 @@ static struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },

	{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },





	/* Atheros 3012 with sflash firmware */

	/* Atheros 3012 with sflash firmware */

	{ USB_DEVICE(0x0cf3, 0x0036), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x817a), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },

drivers/net/ethernet/freescale/fec_ptp.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -128,6 +128,7 @@ void fec_ptp_start_cyclecounter(struct net_device *ndev) 




	spin_unlock_irqrestore(&fep->tmreg_lock, flags);

	spin_unlock_irqrestore(&fep->tmreg_lock, flags);

}

}

EXPORT_SYMBOL(fec_ptp_start_cyclecounter);





/**

/**

 * fec_ptp_adjfreq - adjust ptp cycle frequency

 * fec_ptp_adjfreq - adjust ptp cycle frequency
@@ -318,6 +319,7 @@ int fec_ptp_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd) 
	return copy_to_user(ifr->ifr_data, &config, sizeof(config)) ?

	return copy_to_user(ifr->ifr_data, &config, sizeof(config)) ?

	    -EFAULT : 0;

	    -EFAULT : 0;

}

}

EXPORT_SYMBOL(fec_ptp_ioctl);





/**

/**

 * fec_time_keep - call timecounter_read every second to avoid timer overrun

 * fec_time_keep - call timecounter_read every second to avoid timer overrun
@@ -383,3 +385,4 @@ void fec_ptp_init(struct net_device *ndev, struct platform_device *pdev) 
		pr_info("registered PHC device on %s\n", ndev->name);

		pr_info("registered PHC device on %s\n", ndev->name);

	}

	}

}

}

EXPORT_SYMBOL(fec_ptp_init);

drivers/net/ethernet/lantiq_etop.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -769,7 +769,7 @@ ltq_etop_probe(struct platform_device *pdev) 
	return 0;

	return 0;





err_free:

err_free:

	kfree(dev);

	free_netdev(dev);

err_out:

err_out:

	return err;

	return err;

}

}

drivers/net/ethernet/mellanox/mlx4/en_netdev.c

+11 −11
Original line number Original line Diff line number Diff line
@@ -1637,6 +1637,17 @@ void mlx4_en_stop_port(struct net_device *dev, int detach) 
	/* Flush multicast filter */

	/* Flush multicast filter */

	mlx4_SET_MCAST_FLTR(mdev->dev, priv->port, 0, 1, MLX4_MCAST_CONFIG);

	mlx4_SET_MCAST_FLTR(mdev->dev, priv->port, 0, 1, MLX4_MCAST_CONFIG);





	/* Remove flow steering rules for the port*/

	if (mdev->dev->caps.steering_mode ==

	    MLX4_STEERING_MODE_DEVICE_MANAGED) {

		ASSERT_RTNL();

		list_for_each_entry_safe(flow, tmp_flow,

					 &priv->ethtool_list, list) {

			mlx4_flow_detach(mdev->dev, flow->id);

			list_del(&flow->list);

		}

	}



	mlx4_en_destroy_drop_qp(priv);

	mlx4_en_destroy_drop_qp(priv);





	/* Free TX Rings */

	/* Free TX Rings */
@@ -1657,17 +1668,6 @@ void mlx4_en_stop_port(struct net_device *dev, int detach) 
	if (!(mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAGS2_REASSIGN_MAC_EN))

	if (!(mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAGS2_REASSIGN_MAC_EN))

		mdev->mac_removed[priv->port] = 1;

		mdev->mac_removed[priv->port] = 1;





	/* Remove flow steering rules for the port*/

	if (mdev->dev->caps.steering_mode ==

	    MLX4_STEERING_MODE_DEVICE_MANAGED) {

		ASSERT_RTNL();

		list_for_each_entry_safe(flow, tmp_flow,

					 &priv->ethtool_list, list) {

			mlx4_flow_detach(mdev->dev, flow->id);

			list_del(&flow->list);

		}

	}



	/* Free RX Rings */

	/* Free RX Rings */

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

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

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

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE