Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6 (5a412ad7) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/net/e100.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1512,7 +1512,7 @@ static int e100_phy_init(struct nic *nic)

		static int e100_hw_init(struct nic *nic)
		{
		int err;
		int err = 0;

		e100_hw_reset(nic);

drivers/net/igb/e1000_82575.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -244,6 +244,14 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
		*/
		size += NVM_WORD_SIZE_BASE_SHIFT;

		/*
		* Check for invalid size
		*/
		if ((hw->mac.type == e1000_82576) && (size > 15)) {
		printk("igb: The NVM size is not valid, "
		"defaulting to 32K.\n");
		size = 15;
		}
		nvm->word_size = 1 << size;
		if (nvm->word_size == (1 << 15))
		nvm->page_size = 128;

drivers/net/igbvf/ethtool.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -391,11 +391,6 @@ static int igbvf_set_wol(struct net_device *netdev,
		return -EOPNOTSUPP;
		}

		static int igbvf_phys_id(struct net_device *netdev, u32 data)
		{
		return 0;
		}

		static int igbvf_get_coalesce(struct net_device *netdev,
		struct ethtool_coalesce *ec)
		{
		@@ -527,7 +522,6 @@ static const struct ethtool_ops igbvf_ethtool_ops = {
		.self_test = igbvf_diag_test,
		.get_sset_count = igbvf_get_sset_count,
		.get_strings = igbvf_get_strings,
		.phys_id = igbvf_phys_id,
		.get_ethtool_stats = igbvf_get_ethtool_stats,
		.get_coalesce = igbvf_get_coalesce,
		.set_coalesce = igbvf_set_coalesce,

drivers/net/ixgb/ixgb.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -157,9 +157,6 @@ struct ixgb_adapter {
		u16 link_duplex;
		struct work_struct tx_timeout_task;

		struct timer_list blink_timer;
		unsigned long led_status;

		/* TX */
		struct ixgb_desc_ring tx_ring ____cacheline_aligned_in_smp;
		unsigned int restart_queue;

drivers/net/ixgb/ixgb_ethtool.c

+12 −34

Original line number	Diff line number	Diff line
		@@ -611,45 +611,23 @@ ixgb_set_ringparam(struct net_device *netdev,
		return err;
		}

		/* toggle LED 4 times per second = 2 "blinks" per second */
		#define IXGB_ID_INTERVAL (HZ/4)

		/* bit defines for adapter->led_status */
		#define IXGB_LED_ON 0

		static void
		ixgb_led_blink_callback(unsigned long data)
		{
		struct ixgb_adapter adapter = (struct ixgb_adapter )data;

		if (test_and_change_bit(IXGB_LED_ON, &adapter->led_status))
		ixgb_led_off(&adapter->hw);
		else
		ixgb_led_on(&adapter->hw);

		mod_timer(&adapter->blink_timer, jiffies + IXGB_ID_INTERVAL);
		}

		static int
		ixgb_phys_id(struct net_device *netdev, u32 data)
		ixgb_set_phys_id(struct net_device *netdev, enum ethtool_phys_id_state state)
		{
		struct ixgb_adapter *adapter = netdev_priv(netdev);

		if (!data)
		data = INT_MAX;

		if (!adapter->blink_timer.function) {
		init_timer(&adapter->blink_timer);
		adapter->blink_timer.function = ixgb_led_blink_callback;
		adapter->blink_timer.data = (unsigned long)adapter;
		}
		switch (state) {
		case ETHTOOL_ID_ACTIVE:
		return 2;

		mod_timer(&adapter->blink_timer, jiffies);
		case ETHTOOL_ID_ON:
		ixgb_led_on(&adapter->hw);
		break;

		msleep_interruptible(data * 1000);
		del_timer_sync(&adapter->blink_timer);
		case ETHTOOL_ID_OFF:
		case ETHTOOL_ID_INACTIVE:
		ixgb_led_off(&adapter->hw);
		clear_bit(IXGB_LED_ON, &adapter->led_status);
		}

		return 0;
		}
		@@ -767,7 +745,7 @@ static const struct ethtool_ops ixgb_ethtool_ops = {
		.set_msglevel = ixgb_set_msglevel,
		.set_tso = ixgb_set_tso,
		.get_strings = ixgb_get_strings,
		.phys_id = ixgb_phys_id,
		.set_phys_id = ixgb_set_phys_id,
		.get_sset_count = ixgb_get_sset_count,
		.get_ethtool_stats = ixgb_get_ethtool_stats,
		.get_flags = ethtool_op_get_flags,