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

Commit 5b9ab2ec authored by David S. Miller's avatar David S. Miller
Browse files

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

Conflicts:

	drivers/net/hp-plus.c
	drivers/net/wireless/ath5k/base.c
	drivers/net/wireless/ath9k/recv.c
	net/wireless/reg.c
parents 851fd7bd 3ec19255

drivers/net/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,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
@@ -343,7 +343,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

 **/

drivers/net/hp-plus.c

+5 −5
Original line number Diff line number Diff line
@@ -161,14 +161,14 @@ struct net_device * __init hp_plus_probe(int unit) 
static const struct net_device_ops hpp_netdev_ops = {

	.ndo_open		= hpp_open,

	.ndo_stop		= hpp_close,

	.ndo_start_xmit		= ei_start_xmit,

	.ndo_tx_timeout		= ei_tx_timeout,

	.ndo_get_stats		= ei_get_stats,

	.ndo_set_multicast_list = ei_set_multicast_list,

	.ndo_start_xmit		= eip_start_xmit,

	.ndo_tx_timeout		= eip_tx_timeout,

	.ndo_get_stats		= eip_get_stats,

	.ndo_set_multicast_list = eip_set_multicast_list,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_change_mtu		= eth_change_mtu,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	= ei_poll,

	.ndo_poll_controller	= eip_poll,

#endif

};

drivers/net/igb/igb_main.c

+0 −4
Original line number Diff line number Diff line
@@ -1975,7 +1975,6 @@ static void igb_configure_rx(struct igb_adapter *adapter) 


/**

 * igb_free_tx_resources - Free Tx Resources per Queue

 * @adapter: board private structure

 * @tx_ring: Tx descriptor ring for a specific queue

 *

 * Free all transmit software resources
@@ -2028,7 +2027,6 @@ static void igb_unmap_and_free_tx_resource(struct igb_adapter *adapter, 


/**

 * igb_clean_tx_ring - Free Tx Buffers

 * @adapter: board private structure

 * @tx_ring: ring to be cleaned

 **/

static void igb_clean_tx_ring(struct igb_ring *tx_ring)
@@ -2075,7 +2073,6 @@ static void igb_clean_all_tx_rings(struct igb_adapter *adapter) 


/**

 * igb_free_rx_resources - Free Rx Resources

 * @adapter: board private structure

 * @rx_ring: ring to clean the resources from

 *

 * Free all receive software resources
@@ -2115,7 +2112,6 @@ static void igb_free_all_rx_resources(struct igb_adapter *adapter) 


/**

 * igb_clean_rx_ring - Free Rx Buffers per Queue

 * @adapter: board private structure

 * @rx_ring: ring to free buffers from

 **/

static void igb_clean_rx_ring(struct igb_ring *rx_ring)