Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1825e75 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: (30 commits)
  MAINTAINERS: add netdev to ATM
  ATM: horizon, fix hrz_probe fail path
  pppol2tp: Add missing sock_put() in pppol2tp_release()
  net: Fix soft lockups/OOM issues w/ unix garbage collector
  macvlan: don't broadcast PAUSE frames to macvlan devices
  Phonet: fix oops in phonet_address_del() on non-Phonet device
  netfilter: ctnetlink: fix GFP_KERNEL allocation under spinlock
  sungem: Fix PCS_MIICTRL register write in gem_init_phy().
  net: make skb_truesize_bug() call WARN()
  net: hp-plus uses eip_poll
  net/wireless/reg.c: fix bad WARN_ON in if statement
  ath5k: disable beacon filter when station is not associated
  ath5k: fix Security issue in DebugFS part of ath5k
  ath9k: correct expected max RX buffer size
  ath9k: Fix SW-IOMMU bounce buffer starvation
  mac80211 : Fix setting ad-hoc mode and non-ibss channel
  iwlagn: fix DMA sync
  phylib: Add Vitesse VSC8221 SGMII PHY
  rose: zero length frame filtering in af_rose.c
  bridge: netfilter: fix update_pmtu crash with GRE
  ...
parents 5d279dcf 44ae98b5

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -779,6 +779,7 @@ ATM 
P:	Chas Williams

M:	chas@cmf.nrl.navy.mil

L:	linux-atm-general@lists.sourceforge.net (subscribers-only)

L:	netdev@vger.kernel.org

W:	http://linux-atm.sourceforge.net

S:	Maintained

drivers/atm/horizon.c

+1 −1
Original line number Diff line number Diff line
@@ -2705,7 +2705,7 @@ static int __devinit hrz_probe(struct pci_dev *pci_dev, const struct pci_device_ 


	/* XXX DEV_LABEL is a guess */

	if (!request_region(iobase, HRZ_IO_EXTENT, DEV_LABEL)) {

		return -EINVAL;

		err = -EINVAL;

		goto out_disable;

	}

drivers/net/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ obj-$(CONFIG_EL2) += 3c503.o 8390p.o 
obj-$(CONFIG_NE2000) += ne.o 8390p.o

obj-$(CONFIG_NE2_MCA) += ne2.o 8390p.o

obj-$(CONFIG_HPLAN) += hp.o 8390p.o

obj-$(CONFIG_HPLAN_PLUS) += hp-plus.o 8390.o

obj-$(CONFIG_HPLAN_PLUS) += hp-plus.o 8390p.o

obj-$(CONFIG_ULTRA) += smc-ultra.o 8390.o

obj-$(CONFIG_ULTRAMCA) += smc-mca.o 8390.o

obj-$(CONFIG_ULTRA32) += smc-ultra32.o 8390.o

drivers/net/chelsio/sge.c

+0 −4
Original line number Diff line number Diff line
@@ -1035,10 +1035,6 @@ MODULE_PARM_DESC(copybreak, "Receive copy threshold"); 
 *	@pdev: the PCI device that received the packet

 *	@fl: the SGE free list holding the packet

 *	@len: the actual packet length, excluding any SGE padding

 *	@dma_pad: padding at beginning of buffer left by SGE DMA

 *	@skb_pad: padding to be used if the packet is copied

 *	@copy_thres: length threshold under which a packet should be copied

 *	@drop_thres: # of remaining buffers before we start dropping packets

 *

 *	Get the next packet from a free list and complete setup of the

 *	sk_buff.  If the packet is small we make a copy and recycle the

drivers/net/e1000e/netdev.c

+0 −1
Original line number Diff line number Diff line
@@ -345,7 +345,6 @@ static void e1000_alloc_rx_buffers_ps(struct e1000_adapter *adapter, 
/**

 * e1000_alloc_jumbo_rx_buffers - Replace used jumbo receive buffers

 * @adapter: address of board private structure

 * @rx_ring: pointer to receive ring structure

 * @cleaned_count: number of buffers to allocate this pass

 **/