Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (e77c8e83) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/isdn/gigaset/dummyll.c

+11 −3

Original line number	Diff line number	Diff line
		@@ -57,12 +57,20 @@ void gigaset_isdn_stop(struct cardstate *cs)
		{
		}

		int gigaset_isdn_register(struct cardstate cs, const char isdnid)
		int gigaset_isdn_regdev(struct cardstate cs, const char isdnid)
		{
		pr_info("no ISDN subsystem interface\n");
		return 1;
		}

		void gigaset_isdn_unregister(struct cardstate *cs)
		void gigaset_isdn_unregdev(struct cardstate *cs)
		{
		}

		void gigaset_isdn_regdrv(void)
		{
		pr_info("no ISDN subsystem interface\n");
		}

		void gigaset_isdn_unregdrv(void)
		{
		}

drivers/net/arm/ks8695net.c

+9 −15

Original line number	Diff line number	Diff line
		@@ -451,9 +451,8 @@ ks8695_rx_irq(int irq, void *dev_id)
		/**
		* ks8695_rx - Receive packets called by NAPI poll method
		* @ksp: Private data for the KS8695 Ethernet
		* @budget: The max packets would be receive
		* @budget: Number of packets allowed to process
		*/

		static int ks8695_rx(struct ks8695_priv *ksp, int budget)
		{
		struct net_device *ndev = ksp->ndev;
		@@ -461,7 +460,6 @@ static int ks8695_rx(struct ks8695_priv *ksp, int budget)
		int buff_n;
		u32 flags;
		int pktlen;
		int last_rx_processed = -1;
		int received = 0;

		buff_n = ksp->next_rx_desc_read;
		@@ -471,6 +469,7 @@ static int ks8695_rx(struct ks8695_priv *ksp, int budget)
		cpu_to_le32(RDES_OWN)))) {
		rmb();
		flags = le32_to_cpu(ksp->rx_ring[buff_n].status);

		/* Found an SKB which we own, this means we
		* received a packet
		*/
		@@ -533,23 +532,18 @@ static int ks8695_rx(struct ks8695_priv *ksp, int budget)
		ksp->rx_ring[buff_n].status = cpu_to_le32(RDES_OWN);
		rx_finished:
		received++;
		/* And note this as processed so we can start
		* from here next time
		*/
		last_rx_processed = buff_n;
		buff_n = (buff_n + 1) & MAX_RX_DESC_MASK;
		/And note which RX descriptor we last did /
		if (likely(last_rx_processed != -1))
		ksp->next_rx_desc_read =
		(last_rx_processed + 1) &
		MAX_RX_DESC_MASK;
		}

		/* And note which RX descriptor we last did */
		ksp->next_rx_desc_read = buff_n;

		/* And refill the buffers */
		ks8695_refill_rxbuffers(ksp);

		/* Kick the RX DMA engine, in case it became
		* suspended */
		/* Kick the RX DMA engine, in case it became suspended */
		ks8695_writereg(ksp, KS8695_DRSC, 0);

		return received;
		}

drivers/net/igb/e1000_82575.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,7 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
		case E1000_DEV_ID_82576_FIBER:
		case E1000_DEV_ID_82576_SERDES:
		case E1000_DEV_ID_82576_QUAD_COPPER:
		case E1000_DEV_ID_82576_QUAD_COPPER_ET2:
		case E1000_DEV_ID_82576_SERDES_QUAD:
		mac->type = e1000_82576;
		break;

drivers/net/igb/e1000_hw.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ struct e1000_hw;
		#define E1000_DEV_ID_82576_FIBER 0x10E6
		#define E1000_DEV_ID_82576_SERDES 0x10E7
		#define E1000_DEV_ID_82576_QUAD_COPPER 0x10E8
		#define E1000_DEV_ID_82576_QUAD_COPPER_ET2 0x1526
		#define E1000_DEV_ID_82576_NS 0x150A
		#define E1000_DEV_ID_82576_NS_SERDES 0x1518
		#define E1000_DEV_ID_82576_SERDES_QUAD 0x150D

drivers/net/igb/igb_main.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,7 @@ static DEFINE_PCI_DEVICE_TABLE(igb_pci_tbl) = {
		{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_FIBER), board_82575 },
		{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_SERDES), board_82575 },
		{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_SERDES_QUAD), board_82575 },
		{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_QUAD_COPPER_ET2), board_82575 },
		{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_QUAD_COPPER), board_82575 },
		{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_COPPER), board_82575 },
		{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_FIBER_SERDES), board_82575 },