Commit e2197787 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (42 commits)
  virtio_net: Make delayed refill more reliable
  sfc: Use fixed-size buffers for MCDI NVRAM requests
  sfc: Add workspace for GMAC bug workaround to MCDI MAC_STATS buffer
  tcp_probe: avoid modulus operation and wrap fix
  qlge: Only free resources if they were allocated
  netns xfrm: deal with dst entries in netns
  sky2: revert config space change
  vlan: fix vlan_skb_recv()
  netns xfrm: fix "ip xfrm state|policy count" misreport
  sky2: Enable/disable WOL per hardware device
  net: Fix IPv6 GSO type checks in Intel ethernet drivers
  igb/igbvf: cleanup exception handling in tx_map_adv
  MAINTAINERS: Add Intel igbvf maintainer
  e1000/e1000e: don't use small hardware rx buffers
  fmvj18x_cs: add new id (Panasonic lan & modem card)
  be2net: swap only first 2 fields of mcc_wrb
  Please add support for Microsoft MN-120 PCMCIA network card
  be2net: fix bug in rx page posting
  wimax/i2400m: Add support for more i6x50 SKUs
  e1000e: enhance frame fragment detection
  ...
parents 4f4e65d2 39d32157

MAINTAINERS

+4 −4
Original line number Diff line number Diff line
@@ -987,7 +987,6 @@ F: drivers/platform/x86/asus-laptop.c 


ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API

M:	Dan Williams <dan.j.williams@intel.com>

M:	Maciej Sosnowski <maciej.sosnowski@intel.com>

W:	http://sourceforge.net/projects/xscaleiop

S:	Supported

F:	Documentation/crypto/async-tx-api.txt
@@ -1823,7 +1822,6 @@ S: Supported 
F:	fs/dlm/



DMA GENERIC OFFLOAD ENGINE SUBSYSTEM

M:	Maciej Sosnowski <maciej.sosnowski@intel.com>

M:	Dan Williams <dan.j.williams@intel.com>

S:	Supported

F:	drivers/dma/
@@ -2786,7 +2784,7 @@ F: arch/x86/kernel/microcode_core.c 
F:	arch/x86/kernel/microcode_intel.c



INTEL I/OAT DMA DRIVER

M:	Maciej Sosnowski <maciej.sosnowski@intel.com>

M:	Dan Williams <dan.j.williams@intel.com>

S:	Supported

F:	drivers/dma/ioat*
@@ -2824,10 +2822,11 @@ L: netdev@vger.kernel.org 
S:	Maintained

F:	drivers/net/ixp2000/



INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/ixgb/ixgbe)

INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe)

M:	Jeff Kirsher <jeffrey.t.kirsher@intel.com>

M:	Jesse Brandeburg <jesse.brandeburg@intel.com>

M:	Bruce Allan <bruce.w.allan@intel.com>

M:	Alex Duyck <alexander.h.duyck@intel.com>

M:	PJ Waskiewicz <peter.p.waskiewicz.jr@intel.com>

M:	John Ronciak <john.ronciak@intel.com>

L:	e1000-devel@lists.sourceforge.net
@@ -2837,6 +2836,7 @@ F: drivers/net/e100.c 
F:	drivers/net/e1000/

F:	drivers/net/e1000e/

F:	drivers/net/igb/

F:	drivers/net/igbvf/

F:	drivers/net/ixgb/

F:	drivers/net/ixgbe/

drivers/net/benet/be_cmds.c

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ static void be_wrb_hdr_prepare(struct be_mcc_wrb *wrb, int payload_len, 
				MCC_WRB_SGE_CNT_SHIFT;

	wrb->payload_length = payload_len;

	wrb->tag0 = opcode;

	be_dws_cpu_to_le(wrb, 20);

	be_dws_cpu_to_le(wrb, 8);

}



/* Don't touch the hdr after it's prepared */

drivers/net/benet/be_main.c

+5 −3
Original line number Diff line number Diff line
@@ -910,7 +910,7 @@ static inline struct page *be_alloc_pages(u32 size) 
static void be_post_rx_frags(struct be_adapter *adapter)

{

	struct be_rx_page_info *page_info_tbl = adapter->rx_obj.page_info_tbl;

	struct be_rx_page_info *page_info = NULL;

	struct be_rx_page_info *page_info = NULL, *prev_page_info = NULL;

	struct be_queue_info *rxq = &adapter->rx_obj.q;

	struct page *pagep = NULL;

	struct be_eth_rx_d *rxd;
@@ -941,7 +941,6 @@ static void be_post_rx_frags(struct be_adapter *adapter) 
		rxd = queue_head_node(rxq);

		rxd->fragpa_lo = cpu_to_le32(frag_dmaaddr & 0xFFFFFFFF);

		rxd->fragpa_hi = cpu_to_le32(upper_32_bits(frag_dmaaddr));

		queue_head_inc(rxq);



		/* Any space left in the current big page for another frag? */

		if ((page_offset + rx_frag_size + rx_frag_size) >
@@ -949,10 +948,13 @@ static void be_post_rx_frags(struct be_adapter *adapter) 
			pagep = NULL;

			page_info->last_page_user = true;

		}



		prev_page_info = page_info;

		queue_head_inc(rxq);

		page_info = &page_info_tbl[rxq->head];

	}

	if (pagep)

		page_info->last_page_user = true;

		prev_page_info->last_page_user = true;



	if (posted) {

		atomic_add(posted, &rxq->used);

drivers/net/bfin_mac.c

+3 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <asm/dma.h>

#include <linux/dma-mapping.h>



#include <asm/dpmc.h>

#include <asm/blackfin.h>

#include <asm/cacheflush.h>

#include <asm/portmux.h>
@@ -386,8 +387,8 @@ static int mii_probe(struct net_device *dev) 
	u32 sclk, mdc_div;



	/* Enable PHY output early */

	if (!(bfin_read_VR_CTL() & PHYCLKOE))

		bfin_write_VR_CTL(bfin_read_VR_CTL() | PHYCLKOE);

	if (!(bfin_read_VR_CTL() & CLKBUFOE))

		bfin_write_VR_CTL(bfin_read_VR_CTL() | CLKBUFOE);



	sclk = get_sclk();

	mdc_div = ((sclk / MDC_CLK) / 2) - 1;

drivers/net/e1000/e1000.h

+2 −0
Original line number Diff line number Diff line
@@ -326,6 +326,8 @@ struct e1000_adapter { 
	/* for ioport free */

	int bars;

	int need_ioport;



	bool discarding;

};



enum e1000_state_t {

CRA Git | Maintained and supported by SUSTech CRA and CCSE