Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (d0e1e88d) · Commits · 戴 / test

drivers/isdn/hisax/elsa_ser.c

+11 −11

Original line number	Diff line number	Diff line
		@@ -477,62 +477,62 @@ static void
		modem_set_init(struct IsdnCardState *cs) {
		int timeout;

		#define RCV_DELAY 20000
		#define RCV_DELAY 20
		modem_write_cmd(cs, MInit_1, strlen(MInit_1));
		timeout = 1000;
		while(timeout-- && cs->hw.elsa.transcnt)
		udelay(1000);
		debugl1(cs, "msi tout=%d", timeout);
		udelay(RCV_DELAY);
		mdelay(RCV_DELAY);
		modem_write_cmd(cs, MInit_2, strlen(MInit_2));
		timeout = 1000;
		while(timeout-- && cs->hw.elsa.transcnt)
		udelay(1000);
		debugl1(cs, "msi tout=%d", timeout);
		udelay(RCV_DELAY);
		mdelay(RCV_DELAY);
		modem_write_cmd(cs, MInit_3, strlen(MInit_3));
		timeout = 1000;
		while(timeout-- && cs->hw.elsa.transcnt)
		udelay(1000);
		debugl1(cs, "msi tout=%d", timeout);
		udelay(RCV_DELAY);
		mdelay(RCV_DELAY);
		modem_write_cmd(cs, MInit_4, strlen(MInit_4));
		timeout = 1000;
		while(timeout-- && cs->hw.elsa.transcnt)
		udelay(1000);
		debugl1(cs, "msi tout=%d", timeout);
		udelay(RCV_DELAY );
		mdelay(RCV_DELAY);
		modem_write_cmd(cs, MInit_5, strlen(MInit_5));
		timeout = 1000;
		while(timeout-- && cs->hw.elsa.transcnt)
		udelay(1000);
		debugl1(cs, "msi tout=%d", timeout);
		udelay(RCV_DELAY);
		mdelay(RCV_DELAY);
		modem_write_cmd(cs, MInit_6, strlen(MInit_6));
		timeout = 1000;
		while(timeout-- && cs->hw.elsa.transcnt)
		udelay(1000);
		debugl1(cs, "msi tout=%d", timeout);
		udelay(RCV_DELAY);
		mdelay(RCV_DELAY);
		modem_write_cmd(cs, MInit_7, strlen(MInit_7));
		timeout = 1000;
		while(timeout-- && cs->hw.elsa.transcnt)
		udelay(1000);
		debugl1(cs, "msi tout=%d", timeout);
		udelay(RCV_DELAY);
		mdelay(RCV_DELAY);
		}

		static void
		modem_set_dial(struct IsdnCardState *cs, int outgoing) {
		int timeout;
		#define RCV_DELAY 20000
		#define RCV_DELAY 20

		modem_write_cmd(cs, MInit_speed28800, strlen(MInit_speed28800));
		timeout = 1000;
		while(timeout-- && cs->hw.elsa.transcnt)
		udelay(1000);
		debugl1(cs, "msi tout=%d", timeout);
		udelay(RCV_DELAY);
		mdelay(RCV_DELAY);
		if (outgoing)
		modem_write_cmd(cs, MInit_dialout, strlen(MInit_dialout));
		else
		@@ -541,7 +541,7 @@ modem_set_dial(struct IsdnCardState *cs, int outgoing) {
		while(timeout-- && cs->hw.elsa.transcnt)
		udelay(1000);
		debugl1(cs, "msi tout=%d", timeout);
		udelay(RCV_DELAY);
		mdelay(RCV_DELAY);
		}

		static void

drivers/net/benet/be.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -269,6 +269,8 @@ struct be_adapter {
		u32 port_num;
		bool promiscuous;
		u32 cap;
		u32 rx_fc; /* Rx flow control */
		u32 tx_fc; /* Tx flow control */
		};

		extern const struct ethtool_ops be_ethtool_ops;

drivers/net/benet/be_ethtool.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -362,10 +362,12 @@ be_set_pauseparam(struct net_device netdev, struct ethtool_pauseparam ecmd)

		if (ecmd->autoneg != 0)
		return -EINVAL;
		adapter->tx_fc = ecmd->tx_pause;
		adapter->rx_fc = ecmd->rx_pause;

		status = be_cmd_set_flow_control(adapter, ecmd->tx_pause,
		ecmd->rx_pause);
		if (!status)
		status = be_cmd_set_flow_control(adapter,
		adapter->tx_fc, adapter->rx_fc);
		if (status)
		dev_warn(&adapter->pdev->dev, "Pause param set failed.\n");

		return status;

drivers/net/benet/be_main.c

+17 −11

Original line number	Diff line number	Diff line
		@@ -1611,11 +1611,21 @@ static int be_open(struct net_device *netdev)
		status = be_cmd_link_status_query(adapter, &link_up, &mac_speed,
		&link_speed);
		if (status)
		return status;
		goto ret_sts;
		be_link_status_update(adapter, link_up);

		status = be_vid_config(adapter);
		if (status)
		goto ret_sts;

		status = be_cmd_set_flow_control(adapter,
		adapter->tx_fc, adapter->rx_fc);
		if (status)
		goto ret_sts;

		schedule_delayed_work(&adapter->work, msecs_to_jiffies(100));
		return 0;
		ret_sts:
		return status;
		}

		static int be_setup(struct be_adapter *adapter)
		@@ -1649,17 +1659,8 @@ static int be_setup(struct be_adapter *adapter)
		if (status != 0)
		goto rx_qs_destroy;

		status = be_vid_config(adapter);
		if (status != 0)
		goto mccqs_destroy;

		status = be_cmd_set_flow_control(adapter, true, true);
		if (status != 0)
		goto mccqs_destroy;
		return 0;

		mccqs_destroy:
		be_mcc_queues_destroy(adapter);
		rx_qs_destroy:
		be_rx_queues_destroy(adapter);
		tx_qs_destroy:
		@@ -1910,6 +1911,10 @@ static void be_netdev_init(struct net_device *netdev)

		adapter->rx_csum = true;

		/* Default settings for Rx and Tx flow control */
		adapter->rx_fc = true;
		adapter->tx_fc = true;

		netif_set_gso_max_size(netdev, 65535);

		BE_SET_NETDEV_OPS(netdev, &be_netdev_ops);
		@@ -2172,6 +2177,7 @@ static int be_suspend(struct pci_dev *pdev, pm_message_t state)
		be_close(netdev);
		rtnl_unlock();
		}
		be_cmd_get_flow_control(adapter, &adapter->tx_fc, &adapter->rx_fc);
		be_clear(adapter);

		pci_save_state(pdev);

drivers/net/can/dev.c

+17 −0

Original line number	Diff line number	Diff line
		@@ -637,6 +637,22 @@ static int can_changelink(struct net_device *dev,
		return 0;
		}

		static size_t can_get_size(const struct net_device *dev)
		{
		struct can_priv *priv = netdev_priv(dev);
		size_t size;

		size = nla_total_size(sizeof(u32)); /* IFLA_CAN_STATE */
		size += sizeof(struct can_ctrlmode); /* IFLA_CAN_CTRLMODE */
		size += nla_total_size(sizeof(u32)); /* IFLA_CAN_RESTART_MS */
		size += sizeof(struct can_bittiming); /* IFLA_CAN_BITTIMING */
		size += sizeof(struct can_clock); /* IFLA_CAN_CLOCK */
		if (priv->bittiming_const) /* IFLA_CAN_BITTIMING_CONST */
		size += sizeof(struct can_bittiming_const);

		return size;
		}

		static int can_fill_info(struct sk_buff skb, const struct net_device dev)
		{
		struct can_priv *priv = netdev_priv(dev);
		@@ -687,6 +703,7 @@ static struct rtnl_link_ops can_link_ops __read_mostly = {
		.setup = can_setup,
		.newlink = can_newlink,
		.changelink = can_changelink,
		.get_size = can_get_size,
		.fill_info = can_fill_info,
		.fill_xstats = can_fill_xstats,
		};

Admin message