Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net (973db569) · Commits · e / devices / android_kernel_teracube_emerald

drivers/net/ethernet/intel/e1000/e1000_main.c

+25 −15

Original line number	Diff line number	Diff line
		@@ -164,6 +164,8 @@ static int e1000_82547_fifo_workaround(struct e1000_adapter *adapter,
		static bool e1000_vlan_used(struct e1000_adapter *adapter);
		static void e1000_vlan_mode(struct net_device *netdev,
		netdev_features_t features);
		static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,
		bool filter_on);
		static int e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid);
		static int e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);
		static void e1000_restore_vlan(struct e1000_adapter *adapter);
		@@ -215,7 +217,8 @@ MODULE_DESCRIPTION("Intel(R) PRO/1000 Network Driver");
		MODULE_LICENSE("GPL");
		MODULE_VERSION(DRV_VERSION);

		static int debug = NETIF_MSG_DRV \| NETIF_MSG_PROBE;
		#define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV\|NETIF_MSG_PROBE\|NETIF_MSG_LINK)
		static int debug = -1;
		module_param(debug, int, 0);
		MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");

		@@ -979,7 +982,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
		adapter = netdev_priv(netdev);
		adapter->netdev = netdev;
		adapter->pdev = pdev;
		adapter->msg_enable = (1 << debug) - 1;
		adapter->msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE);
		adapter->bars = bars;
		adapter->need_ioport = need_ioport;

		@@ -1214,7 +1217,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
		if (err)
		goto err_register;

		e1000_vlan_mode(netdev, netdev->features);
		e1000_vlan_filter_on_off(adapter, false);

		/* print bus type/speed/width info */
		e_info(probe, "(PCI%s:%dMHz:%d-bit) %pM\n",
		@@ -4770,6 +4773,22 @@ static bool e1000_vlan_used(struct e1000_adapter *adapter)
		return false;
		}

		static void __e1000_vlan_mode(struct e1000_adapter *adapter,
		netdev_features_t features)
		{
		struct e1000_hw *hw = &adapter->hw;
		u32 ctrl;

		ctrl = er32(CTRL);
		if (features & NETIF_F_HW_VLAN_RX) {
		/* enable VLAN tag insert/strip */
		ctrl \|= E1000_CTRL_VME;
		} else {
		/* disable VLAN tag insert/strip */
		ctrl &= ~E1000_CTRL_VME;
		}
		ew32(CTRL, ctrl);
		}
		static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,
		bool filter_on)
		{
		@@ -4779,6 +4798,7 @@ static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,
		if (!test_bit(__E1000_DOWN, &adapter->flags))
		e1000_irq_disable(adapter);

		__e1000_vlan_mode(adapter, adapter->netdev->features);
		if (filter_on) {
		/* enable VLAN receive filtering */
		rctl = er32(RCTL);
		@@ -4802,21 +4822,11 @@ static void e1000_vlan_mode(struct net_device *netdev,
		netdev_features_t features)
		{
		struct e1000_adapter *adapter = netdev_priv(netdev);
		struct e1000_hw *hw = &adapter->hw;
		u32 ctrl;

		if (!test_bit(__E1000_DOWN, &adapter->flags))
		e1000_irq_disable(adapter);

		ctrl = er32(CTRL);
		if (features & NETIF_F_HW_VLAN_RX) {
		/* enable VLAN tag insert/strip */
		ctrl \|= E1000_CTRL_VME;
		} else {
		/* disable VLAN tag insert/strip */
		ctrl &= ~E1000_CTRL_VME;
		}
		ew32(CTRL, ctrl);
		__e1000_vlan_mode(adapter, features);

		if (!test_bit(__E1000_DOWN, &adapter->flags))
		e1000_irq_enable(adapter);

drivers/net/ethernet/intel/e1000e/netdev.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -60,6 +60,11 @@
		char e1000e_driver_name[] = "e1000e";
		const char e1000e_driver_version[] = DRV_VERSION;

		#define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV\|NETIF_MSG_PROBE\|NETIF_MSG_LINK)
		static int debug = -1;
		module_param(debug, int, 0);
		MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");

		static void e1000e_disable_aspm(struct pci_dev *pdev, u16 state);

		static const struct e1000_info *e1000_info_tbl[] = {
		@@ -6172,7 +6177,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
		adapter->hw.adapter = adapter;
		adapter->hw.mac.type = ei->mac;
		adapter->max_hw_frame_size = ei->max_hw_frame_size;
		adapter->msg_enable = (1 << NETIF_MSG_DRV \| NETIF_MSG_PROBE) - 1;
		adapter->msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE);

		mmio_start = pci_resource_start(pdev, 0);
		mmio_len = pci_resource_len(pdev, 0);

drivers/net/ethernet/intel/igb/igb_main.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -238,6 +238,11 @@ MODULE_DESCRIPTION("Intel(R) Gigabit Ethernet Network Driver");
		MODULE_LICENSE("GPL");
		MODULE_VERSION(DRV_VERSION);

		#define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV\|NETIF_MSG_PROBE\|NETIF_MSG_LINK)
		static int debug = -1;
		module_param(debug, int, 0);
		MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");

		struct igb_reg_info {
		u32 ofs;
		char *name;
		@@ -1893,7 +1898,7 @@ static int __devinit igb_probe(struct pci_dev *pdev,
		adapter->pdev = pdev;
		hw = &adapter->hw;
		hw->back = adapter;
		adapter->msg_enable = NETIF_MSG_DRV \| NETIF_MSG_PROBE;
		adapter->msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE);

		mmio_start = pci_resource_start(pdev, 0);
		mmio_len = pci_resource_len(pdev, 0);

drivers/net/ethernet/intel/igbvf/netdev.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -55,6 +55,11 @@ static const char igbvf_driver_string[] =
		static const char igbvf_copyright[] =
		"Copyright (c) 2009 - 2012 Intel Corporation.";

		#define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV\|NETIF_MSG_PROBE\|NETIF_MSG_LINK)
		static int debug = -1;
		module_param(debug, int, 0);
		MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");

		static int igbvf_poll(struct napi_struct *napi, int budget);
		static void igbvf_reset(struct igbvf_adapter *);
		static void igbvf_set_interrupt_capability(struct igbvf_adapter *);
		@@ -2649,7 +2654,7 @@ static int __devinit igbvf_probe(struct pci_dev *pdev,
		adapter->flags = ei->flags;
		adapter->hw.back = adapter;
		adapter->hw.mac.type = ei->mac;
		adapter->msg_enable = (1 << NETIF_MSG_DRV \| NETIF_MSG_PROBE) - 1;
		adapter->msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE);

		/* PCI config space info */

drivers/net/ethernet/intel/ixgb/ixgb_main.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -134,8 +134,8 @@ MODULE_DESCRIPTION("Intel(R) PRO/10GbE Network Driver");
		MODULE_LICENSE("GPL");
		MODULE_VERSION(DRV_VERSION);

		#define DEFAULT_DEBUG_LEVEL_SHIFT 3
		static int debug = DEFAULT_DEBUG_LEVEL_SHIFT;
		#define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV\|NETIF_MSG_PROBE\|NETIF_MSG_LINK)
		static int debug = -1;
		module_param(debug, int, 0);
		MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");

		@@ -442,7 +442,7 @@ ixgb_probe(struct pci_dev pdev, const struct pci_device_id ent)
		adapter->netdev = netdev;
		adapter->pdev = pdev;
		adapter->hw.back = adapter;
		adapter->msg_enable = netif_msg_init(debug, DEFAULT_DEBUG_LEVEL_SHIFT);
		adapter->msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE);

		adapter->hw.hw_addr = pci_ioremap_bar(pdev, BAR_0);
		if (!adapter->hw.hw_addr) {