Commit 0d6caa17 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (41 commits)
  [RTNETLINK]: Fix warning for !CONFIG_KMOD
  [IPV4] ip_options.c: kmalloc + memset conversion to kzalloc
  [DECNET]: kmalloc + memset conversion to kzalloc
  [NET]: ethtool_perm_addr only has one implementation
  [NET]: ethtool ops are the only way
  [PPPOE]: Improve hashing function in hash_item().
  [XFRM]: State selection update to use inner addresses.
  [IPSEC]: Ensure that state inner family is set
  [TCP]: Bidir flow must not disregard SACK blocks for lost marking
  [TCP]: Fix ratehalving with bidirectional flows
  [PPPOL2TP]: Add CONFIG_INET Kconfig dependency.
  [NET]: Page offsets and lengths need to be __u32.
  [AF_UNIX]: Make code static.
  [NETFILTER]: Make nf_ct_ipv6_skip_exthdr() static.
  [PKTGEN]: make get_ipsec_sa() static and non-inline
  [PPPoE]: move lock_sock() in pppoe_sendmsg() to the right location
  [PPPoX/E]: return ENOTTY on unknown ioctl requests
  [IPV6]: ipv6_addr_type() doesn't know about RFC4193 addresses.
  [NET]: Fix prio_tune() handling of root qdisc.
  [NET]: Fix sch_api to properly set sch->parent on the root.
  ...
parents 88c8199b 8072f085

drivers/dma/iovlock.c

+0 −27
Original line number Diff line number Diff line
@@ -143,29 +143,6 @@ void dma_unpin_iovec_pages(struct dma_pinned_list *pinned_list) 
	kfree(pinned_list);

}



static dma_cookie_t dma_memcpy_to_kernel_iovec(struct dma_chan *chan, struct

	iovec *iov, unsigned char *kdata, size_t len)

{

	dma_cookie_t dma_cookie = 0;



	while (len > 0) {

		if (iov->iov_len) {

			int copy = min_t(unsigned int, iov->iov_len, len);

			dma_cookie = dma_async_memcpy_buf_to_buf(

					chan,

					iov->iov_base,

					kdata,

					copy);

			kdata += copy;

			len -= copy;

			iov->iov_len -= copy;

			iov->iov_base += copy;

		}

		iov++;

	}



	return dma_cookie;

}



/*

 * We have already pinned down the pages we will be using in the iovecs.
@@ -187,10 +164,6 @@ dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov, 
	if (!chan)

		return memcpy_toiovec(iov, kdata, len);



	/* -> kernel copies (e.g. smbfs) */

	if (!pinned_list)

		return dma_memcpy_to_kernel_iovec(chan, iov, kdata, len);



	iovec_idx = 0;

	while (iovec_idx < pinned_list->nr_iovecs) {

		struct dma_page_list *page_list;

drivers/net/3c59x.c

+0 −1
Original line number Diff line number Diff line
@@ -2886,7 +2886,6 @@ static const struct ethtool_ops vortex_ethtool_ops = { 
	.set_settings           = vortex_set_settings,

	.get_link               = ethtool_op_get_link,

	.nway_reset             = vortex_nway_reset,

	.get_perm_addr		= ethtool_op_get_perm_addr,

};



#ifdef CONFIG_PCI

drivers/net/8139cp.c

+0 −1
Original line number Diff line number Diff line
@@ -1578,7 +1578,6 @@ static const struct ethtool_ops cp_ethtool_ops = { 
	.set_wol		= cp_set_wol,

	.get_strings		= cp_get_strings,

	.get_ethtool_stats	= cp_get_ethtool_stats,

	.get_perm_addr		= ethtool_op_get_perm_addr,

	.get_eeprom_len		= cp_get_eeprom_len,

	.get_eeprom		= cp_get_eeprom,

	.set_eeprom		= cp_set_eeprom,

drivers/net/8139too.c

+0 −1
Original line number Diff line number Diff line
@@ -2452,7 +2452,6 @@ static const struct ethtool_ops rtl8139_ethtool_ops = { 
	.get_strings		= rtl8139_get_strings,

	.get_stats_count	= rtl8139_get_stats_count,

	.get_ethtool_stats	= rtl8139_get_ethtool_stats,

	.get_perm_addr		= ethtool_op_get_perm_addr,

};



static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)

drivers/net/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2851,7 +2851,7 @@ config PPPOATM 


config PPPOL2TP

	tristate "PPP over L2TP (EXPERIMENTAL)"

	depends on EXPERIMENTAL && PPP

	depends on EXPERIMENTAL && PPP && INET

	help

	  Support for PPP-over-L2TP socket family. L2TP is a protocol

	  used by ISPs and enterprises to tunnel PPP traffic over UDP

CRA Git | Maintained and supported by SUSTech CRA and CCSE