Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (097916ec) · Commits · e / devices / android_kernel_teracube_2e

MAINTAINERS

+12 −5

Original line number	Diff line number	Diff line
		@@ -1398,7 +1398,7 @@ IRDA SUBSYSTEM
		P: Jean Tourrilhes
		L: irda-users@lists.sourceforge.net (subscribers-only)
		W: http://irda.sourceforge.net/
		S: Maintained
		S: Odd Fixes

		ISAPNP
		P: Jaroslav Kysela
		@@ -1843,7 +1843,14 @@ M: yoshfuji@linux-ipv6.org
		P: Patrick McHardy
		M: kaber@coreworks.de
		L: netdev@vger.kernel.org
		T: git kernel.org:/pub/scm/linux/kernel/davem/net-2.6.git
		T: git kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
		S: Maintained

		NETWORKING [WIRELESS]
		P: John W. Linville
		M: linville@tuxdriver.com
		L: netdev@vger.kernel.org
		T: git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
		S: Maintained

		IPVS
		@@ -2536,11 +2543,11 @@ S: Maintained

		TIPC NETWORK LAYER
		P: Per Liden
		M: per.liden@nospam.ericsson.com
		M: per.liden@ericsson.com
		P: Jon Maloy
		M: jon.maloy@nospam.ericsson.com
		M: jon.maloy@ericsson.com
		P: Allan Stephens
		M: allan.stephens@nospam.windriver.com
		M: allan.stephens@windriver.com
		L: tipc-discussion@lists.sourceforge.net
		W: http://tipc.sourceforge.net/
		W: http://tipc.cslab.ericsson.net/

drivers/net/cassini.c

+32 −4

Original line number	Diff line number	Diff line
		@@ -335,6 +335,30 @@ static inline void cas_mask_intr(struct cas *cp)
		cas_disable_irq(cp, i);
		}

		static inline void cas_buffer_init(cas_page_t *cp)
		{
		struct page *page = cp->buffer;
		atomic_set((atomic_t *)&page->lru.next, 1);
		}

		static inline int cas_buffer_count(cas_page_t *cp)
		{
		struct page *page = cp->buffer;
		return atomic_read((atomic_t *)&page->lru.next);
		}

		static inline void cas_buffer_inc(cas_page_t *cp)
		{
		struct page *page = cp->buffer;
		atomic_inc((atomic_t *)&page->lru.next);
		}

		static inline void cas_buffer_dec(cas_page_t *cp)
		{
		struct page *page = cp->buffer;
		atomic_dec((atomic_t *)&page->lru.next);
		}

		static void cas_enable_irq(struct cas *cp, const int ring)
		{
		if (ring == 0) { /* all but TX_DONE */
		@@ -472,6 +496,7 @@ static int cas_page_free(struct cas cp, cas_page_t page)
		{
		pci_unmap_page(cp->pdev, page->dma_addr, cp->page_size,
		PCI_DMA_FROMDEVICE);
		cas_buffer_dec(page);
		__free_pages(page->buffer, cp->page_order);
		kfree(page);
		return 0;
		@@ -501,6 +526,7 @@ static cas_page_t cas_page_alloc(struct cas cp, const gfp_t flags)
		page->buffer = alloc_pages(flags, cp->page_order);
		if (!page->buffer)
		goto page_err;
		cas_buffer_init(page);
		page->dma_addr = pci_map_page(cp->pdev, page->buffer, 0,
		cp->page_size, PCI_DMA_FROMDEVICE);
		return page;
		@@ -579,7 +605,7 @@ static void cas_spare_recover(struct cas *cp, const gfp_t flags)
		list_for_each_safe(elem, tmp, &list) {
		cas_page_t *page = list_entry(elem, cas_page_t, list);

		if (page_count(page->buffer) > 1)
		if (cas_buffer_count(page) > 1)
		continue;

		list_del(elem);
		@@ -1347,7 +1373,7 @@ static inline cas_page_t cas_page_spare(struct cas cp, const int index)
		cas_page_t *page = cp->rx_pages[1][index];
		cas_page_t *new;

		if (page_count(page->buffer) == 1)
		if (cas_buffer_count(page) == 1)
		return page;

		new = cas_page_dequeue(cp);
		@@ -1367,7 +1393,7 @@ static cas_page_t cas_page_swap(struct cas cp, const int ring,
		cas_page_t **page1 = cp->rx_pages[1];

		/* swap if buffer is in use */
		if (page_count(page0[index]->buffer) > 1) {
		if (cas_buffer_count(page0[index]) > 1) {
		cas_page_t *new = cas_page_spare(cp, index);
		if (new) {
		page1[index] = page0[index];
		@@ -2039,6 +2065,7 @@ static int cas_rx_process_pkt(struct cas cp, struct cas_rx_comp rxc,
		skb->len += hlen - swivel;

		get_page(page->buffer);
		cas_buffer_inc(page);
		frag->page = page->buffer;
		frag->page_offset = off;
		frag->size = hlen - swivel;
		@@ -2063,6 +2090,7 @@ static int cas_rx_process_pkt(struct cas cp, struct cas_rx_comp rxc,
		frag++;

		get_page(page->buffer);
		cas_buffer_inc(page);
		frag->page = page->buffer;
		frag->page_offset = 0;
		frag->size = hlen;
		@@ -2225,7 +2253,7 @@ static int cas_post_rxds_ringN(struct cas *cp, int ring, int num)
		released = 0;
		while (entry != last) {
		/* make a new buffer if it's still in use */
		if (page_count(page[entry]->buffer) > 1) {
		if (cas_buffer_count(page[entry]) > 1) {
		cas_page_t *new = cas_page_dequeue(cp);
		if (!new) {
		/* let the timer know that we need to

include/linux/if_ether.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,7 @@
		* over Ethernet
		*/
		#define ETH_P_AOE 0x88A2 /* ATA over Ethernet */
		#define ETH_P_TIPC 0x88CA /* TIPC */

		/*
		* Non DIX types. Won't clash for 1500 types.

include/linux/tipc_config.h

+5 −2

Original line number	Diff line number	Diff line
		@@ -168,10 +168,13 @@
		#define TIPC_MAX_LINK_NAME 60 /* format = Z.C.N:interface-Z.C.N:interface */

		/*
		* Link priority limits (range from 0 to # priorities - 1)
		* Link priority limits (min, default, max, media default)
		*/

		#define TIPC_NUM_LINK_PRI 32
		#define TIPC_MIN_LINK_PRI 0
		#define TIPC_DEF_LINK_PRI 10
		#define TIPC_MAX_LINK_PRI 31
		#define TIPC_MEDIA_LINK_PRI (TIPC_MAX_LINK_PRI + 1)

		/*
		* Link tolerance limits (min, default, max), in ms

net/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -150,6 +150,7 @@ endif

		source "net/dccp/Kconfig"
		source "net/sctp/Kconfig"
		source "net/tipc/Kconfig"
		source "net/atm/Kconfig"
		source "net/bridge/Kconfig"
		source "net/8021q/Kconfig"
		@@ -159,7 +160,6 @@ source "net/ipx/Kconfig"
		source "drivers/net/appletalk/Kconfig"
		source "net/x25/Kconfig"
		source "net/lapb/Kconfig"
		source "net/tipc/Kconfig"

		config NET_DIVERT
		bool "Frame Diverter (EXPERIMENTAL)"