Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (263fb5b1) · Commits · jan.koester / Linux

drivers/net/benet/be_cmds.c

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1786,6 +1786,10 @@ int be_cmd_get_seeprom_data(struct be_adapter *adapter,
	spin_lock_bh(&adapter->mcc_lock);		spin_lock_bh(&adapter->mcc_lock);

	wrb = wrb_from_mccq(adapter);		wrb = wrb_from_mccq(adapter);
			if (!wrb) {
			status = -EBUSY;
			goto err;
			}
	req = nonemb_cmd->va;		req = nonemb_cmd->va;
	sge = nonembedded_sgl(wrb);		sge = nonembedded_sgl(wrb);

	@@ -1801,6 +1805,7 @@ int be_cmd_get_seeprom_data(struct be_adapter *adapter,

	status = be_mcc_notify_wait(adapter);		status = be_mcc_notify_wait(adapter);

			err:
	spin_unlock_bh(&adapter->mcc_lock);		spin_unlock_bh(&adapter->mcc_lock);
	return status;		return status;
	}		}

drivers/net/bnx2x/bnx2x_main.c

+23 −9

Original line number	Original line	Diff line number	Diff line
	@@ -4300,9 +4300,12 @@ void bnx2x_set_storm_rx_mode(struct bnx2x *bp)
	def_q_filters \|= BNX2X_ACCEPT_UNICAST \| BNX2X_ACCEPT_BROADCAST \|		def_q_filters \|= BNX2X_ACCEPT_UNICAST \| BNX2X_ACCEPT_BROADCAST \|
	BNX2X_ACCEPT_MULTICAST;		BNX2X_ACCEPT_MULTICAST;
	#ifdef BCM_CNIC		#ifdef BCM_CNIC
			if (!NO_FCOE(bp)) {
	cl_id = bnx2x_fcoe(bp, cl_id);		cl_id = bnx2x_fcoe(bp, cl_id);
	bnx2x_rxq_set_mac_filters(bp, cl_id, BNX2X_ACCEPT_UNICAST \|		bnx2x_rxq_set_mac_filters(bp, cl_id,
			BNX2X_ACCEPT_UNICAST \|
	BNX2X_ACCEPT_MULTICAST);		BNX2X_ACCEPT_MULTICAST);
			}
	#endif		#endif
	break;		break;

	@@ -4310,18 +4313,29 @@ void bnx2x_set_storm_rx_mode(struct bnx2x *bp)
	def_q_filters \|= BNX2X_ACCEPT_UNICAST \| BNX2X_ACCEPT_BROADCAST \|		def_q_filters \|= BNX2X_ACCEPT_UNICAST \| BNX2X_ACCEPT_BROADCAST \|
	BNX2X_ACCEPT_ALL_MULTICAST;		BNX2X_ACCEPT_ALL_MULTICAST;
	#ifdef BCM_CNIC		#ifdef BCM_CNIC
			/*
			* Prevent duplication of multicast packets by configuring FCoE
			* L2 Client to receive only matched unicast frames.
			*/
			if (!NO_FCOE(bp)) {
	cl_id = bnx2x_fcoe(bp, cl_id);		cl_id = bnx2x_fcoe(bp, cl_id);
	bnx2x_rxq_set_mac_filters(bp, cl_id, BNX2X_ACCEPT_UNICAST \|		bnx2x_rxq_set_mac_filters(bp, cl_id,
	BNX2X_ACCEPT_MULTICAST);		BNX2X_ACCEPT_UNICAST);
			}
	#endif		#endif
	break;		break;

	case BNX2X_RX_MODE_PROMISC:		case BNX2X_RX_MODE_PROMISC:
	def_q_filters \|= BNX2X_PROMISCUOUS_MODE;		def_q_filters \|= BNX2X_PROMISCUOUS_MODE;
	#ifdef BCM_CNIC		#ifdef BCM_CNIC
			/*
			* Prevent packets duplication by configuring DROP_ALL for FCoE
			* L2 Client.
			*/
			if (!NO_FCOE(bp)) {
	cl_id = bnx2x_fcoe(bp, cl_id);		cl_id = bnx2x_fcoe(bp, cl_id);
	bnx2x_rxq_set_mac_filters(bp, cl_id, BNX2X_ACCEPT_UNICAST \|		bnx2x_rxq_set_mac_filters(bp, cl_id, BNX2X_ACCEPT_NONE);
	BNX2X_ACCEPT_MULTICAST);		}
	#endif		#endif
	/* pass management unicast packets as well */		/* pass management unicast packets as well */
	llh_mask \|= NIG_LLH0_BRB1_DRV_MASK_REG_LLH0_BRB1_DRV_MASK_UNCST;		llh_mask \|= NIG_LLH0_BRB1_DRV_MASK_REG_LLH0_BRB1_DRV_MASK_UNCST;

drivers/net/can/pch_can.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -187,7 +187,7 @@ static struct can_bittiming_const pch_can_bittiming_const = {
	.name = KBUILD_MODNAME,		.name = KBUILD_MODNAME,
	.tseg1_min = 1,		.tseg1_min = 1,
	.tseg1_max = 16,		.tseg1_max = 16,
	.tseg2_min = 1,		.tseg2_min = 2,
	.tseg2_max = 8,		.tseg2_max = 8,
	.sjw_max = 4,		.sjw_max = 4,
	.brp_min = 1,		.brp_min = 1,
	@@ -959,13 +959,13 @@ static void __devexit pch_can_remove(struct pci_dev *pdev)
	struct pch_can_priv *priv = netdev_priv(ndev);		struct pch_can_priv *priv = netdev_priv(ndev);

	unregister_candev(priv->ndev);		unregister_candev(priv->ndev);
	pci_iounmap(pdev, priv->regs);
	if (priv->use_msi)		if (priv->use_msi)
	pci_disable_msi(priv->dev);		pci_disable_msi(priv->dev);
	pci_release_regions(pdev);		pci_release_regions(pdev);
	pci_disable_device(pdev);		pci_disable_device(pdev);
	pci_set_drvdata(pdev, NULL);		pci_set_drvdata(pdev, NULL);
	pch_can_reset(priv);		pch_can_reset(priv);
			pci_iounmap(pdev, priv->regs);
	free_candev(priv->ndev);		free_candev(priv->ndev);
	}		}

	@@ -1238,6 +1238,7 @@ static int __devinit pch_can_probe(struct pci_dev *pdev,
	priv->use_msi = 0;		priv->use_msi = 0;
	} else {		} else {
	netdev_err(ndev, "PCH CAN opened with MSI\n");		netdev_err(ndev, "PCH CAN opened with MSI\n");
			pci_set_master(pdev);
	priv->use_msi = 1;		priv->use_msi = 1;
	}		}

drivers/net/e1000/e1000_hw.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -124,6 +124,7 @@ static s32 e1000_set_phy_type(struct e1000_hw *hw)
	case M88E1000_I_PHY_ID:		case M88E1000_I_PHY_ID:
	case M88E1011_I_PHY_ID:		case M88E1011_I_PHY_ID:
	case M88E1111_I_PHY_ID:		case M88E1111_I_PHY_ID:
			case M88E1118_E_PHY_ID:
	hw->phy_type = e1000_phy_m88;		hw->phy_type = e1000_phy_m88;
	break;		break;
	case IGP01E1000_I_PHY_ID:		case IGP01E1000_I_PHY_ID:
	@@ -3222,7 +3223,8 @@ static s32 e1000_detect_gig_phy(struct e1000_hw *hw)
	break;		break;
	case e1000_ce4100:		case e1000_ce4100:
	if ((hw->phy_id == RTL8211B_PHY_ID) \|\|		if ((hw->phy_id == RTL8211B_PHY_ID) \|\|
	(hw->phy_id == RTL8201N_PHY_ID))		(hw->phy_id == RTL8201N_PHY_ID) \|\|
			(hw->phy_id == M88E1118_E_PHY_ID))
	match = true;		match = true;
	break;		break;
	case e1000_82541:		case e1000_82541:

drivers/net/e1000/e1000_hw.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2917,6 +2917,7 @@ struct e1000_host_command_info {
	#define M88E1000_14_PHY_ID M88E1000_E_PHY_ID		#define M88E1000_14_PHY_ID M88E1000_E_PHY_ID
	#define M88E1011_I_REV_4 0x04		#define M88E1011_I_REV_4 0x04
	#define M88E1111_I_PHY_ID 0x01410CC0		#define M88E1111_I_PHY_ID 0x01410CC0
			#define M88E1118_E_PHY_ID 0x01410E40
	#define L1LXT971A_PHY_ID 0x001378E0		#define L1LXT971A_PHY_ID 0x001378E0

	#define RTL8211B_PHY_ID 0x001CC910		#define RTL8211B_PHY_ID 0x001CC910